Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
a48d68ad
Commit
a48d68ad
authored
Mar 11, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
70a01c4f
07825874
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
6 deletions
+33
-6
EmployeeRegistrationExportVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
+1
-1
EmployeeRegistrationHrExportVo.java
.../cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
+1
-1
SysDeptMapper.java
...m/yifu/cloud/plus/v1/yifu/admin/mapper/SysDeptMapper.java
+2
-0
SysDeptServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
+3
-1
SysUserDeptPermissionServiceImpl.java
.../admin/service/impl/SysUserDeptPermissionServiceImpl.java
+9
-3
SysDeptMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+17
-0
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
View file @
a48d68ad
...
...
@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
1
5
)
@ColumnWidth
(
1
7
)
public
class
EmployeeRegistrationExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"员工姓名"
)
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
View file @
a48d68ad
...
...
@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
1
5
)
@ColumnWidth
(
1
7
)
public
class
EmployeeRegistrationHrExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目编码"
)
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysDeptMapper.java
View file @
a48d68ad
...
...
@@ -51,6 +51,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
List
<
SysDept
>
getDeptListByDeptId
(
@Param
(
"deptIdSplit"
)
String
deptIdSplit
,
@Param
(
"deptId"
)
Long
deptId
);
List
<
SysDept
>
getDeptListByDeptIdSet
(
@Param
(
"departIdSet"
)
Set
<
String
>
departIdSet
);
/**
* 客户服务平台——查询部门管理数据
*
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
View file @
a48d68ad
...
...
@@ -345,6 +345,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
// 获取用户部门集合
Set
<
String
>
allDepartIdSet
=
new
HashSet
<>();
Set
<
String
>
departIdSet
=
authority
.
getDepartIdSet
();
if
(
Common
.
isEmpty
(
departIdSet
)){
return
cspDeptTree
;
}
List
<
SysDeptVo
>
deptVoList
=
baseMapper
.
cspDeptListByDeptIdSet
(
dept
,
departIdSet
);
if
(
Common
.
isNotNull
(
deptVoList
)){
// 将指定部门和祖级部门都存到一个集合里
...
...
@@ -629,7 +632,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
List
<
DeptSortVo
>
moveVos
=
dept
.
getDeptSortList
();
baseMapper
.
batchUpdateSort
(
moveVos
);
// 清理用户权限
// List<String> userNames = sysUserMapper.getCspUserByDeptId(dept.getDeptId());
List
<
String
>
userNames
=
sysUserMapper
.
getCspUserByProjectNo
(
updateEntity
.
getProjectNo
());
if
(
Common
.
isNotNull
(
userNames
)){
for
(
String
us:
userNames
){
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserDeptPermissionServiceImpl.java
View file @
a48d68ad
...
...
@@ -218,16 +218,22 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 全部数据
authority
.
setHaveAll
(
true
);
// redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 指定部门权限
if
(
Common
.
isNotKong
(
tPermissionInfo
.
getAppointDeptScope
()))
{
authority
.
setHaveAll
(
false
);
String
[]
appointDeptIdArr
=
tPermissionInfo
.
getAppointDeptScope
().
split
(
CommonConstants
.
COMMA_STRING
);
Set
<
String
>
appointDeptIdSet
=
Arrays
.
stream
(
appointDeptIdArr
).
collect
(
Collectors
.
toSet
());
authority
.
setDepartIdSet
(
appointDeptIdSet
);
// 过滤被删除的数据
sysDeptList
=
sysDeptMapper
.
getDeptListByDeptIdSet
(
appointDeptIdSet
);
Set
<
String
>
normalDeptIdSet
=
new
HashSet
<>();
if
(
Common
.
isNotNull
(
sysDeptList
)){
for
(
SysDept
dept
:
sysDeptList
){
normalDeptIdSet
.
add
(
dept
.
getDeptId
().
toString
());
}
}
authority
.
setDepartIdSet
(
normalDeptIdSet
);
authority
.
setUserId
(
userId
);
// redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
}
else
{
log
.
error
(
"获取用户权限失败,该用户指定部门权限为空{}"
,
userId
);
authority
.
setHaveAll
(
false
);
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
View file @
a48d68ad
...
...
@@ -63,6 +63,23 @@
and (dept_id = #{deptId} or ancestors like concat(#{deptIdSplit}, '%'))
</select>
<select
id=
"getDeptListByDeptIdSet"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"
>
select
dept_id as deptId,
name as deptName
from
sys_dept
where
del_flag = '0'
<if
test=
"departIdSet != null and departIdSet.size > 0"
>
AND dept_id in
<foreach
item=
"idStr"
index=
"index"
collection=
"departIdSet"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
</select>
<select
id=
"cspDeptList"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo"
>
select d.dept_id, d.name, d.parent_id,d.ancestors,sort_order
from sys_dept d
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment