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
93d7e957
Commit
93d7e957
authored
Mar 04, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
b7afba65
56df3788
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
2 deletions
+66
-2
DeptController.java
...u/cloud/plus/v1/yifu/admin/controller/DeptController.java
+14
-0
SysDeptMapper.java
...m/yifu/cloud/plus/v1/yifu/admin/mapper/SysDeptMapper.java
+4
-0
SysUserMapper.java
...m/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
+2
-0
SysDeptService.java
...yifu/cloud/plus/v1/yifu/admin/service/SysDeptService.java
+8
-0
SysDeptServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
+26
-2
SysDeptMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+4
-0
SysUserMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+8
-0
No files found.
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/DeptController.java
View file @
93d7e957
...
...
@@ -311,4 +311,18 @@ public class DeptController {
return
sysDeptService
.
cspUpdateDept
(
dept
);
}
/**
* 客户服务平台——获取项目下已删除的部门
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
@GetMapping
(
value
=
"/csp/getDelDeptIds"
)
public
R
<
String
>
cspDelDeptIds
(
SysDeptVo
dept
)
{
if
(
Common
.
isEmpty
(
dept
.
getProjectNo
())){
return
R
.
failed
(
"项目编码不能为空"
);
}
return
R
.
ok
(
sysDeptService
.
cspDelDeptIds
(
dept
.
getProjectNo
()));
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysDeptMapper.java
View file @
93d7e957
...
...
@@ -97,4 +97,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
void
batchUpdateSort
(
@Param
(
"moveVos"
)
List
<
DeptSortVo
>
moveVos
);
List
<
SysDept
>
cspDelDeptIds
(
@Param
(
"projectNo"
)
String
projectNo
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
View file @
93d7e957
...
...
@@ -105,4 +105,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
@Param
(
"projectNo"
)
String
projectNo
);
List
<
String
>
getCspUserByDeptId
(
@Param
(
"deptId"
)
String
deptId
);
List
<
String
>
getCspUserByProjectNo
(
@Param
(
"projectNo"
)
String
projectNo
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysDeptService.java
View file @
93d7e957
...
...
@@ -144,4 +144,12 @@ public interface SysDeptService extends IService<SysDept> {
R
<
Boolean
>
cspUpdateDept
(
SysDeptMoveVo
dept
);
/**
* 客户服务平台——获取项目下已删除的部门
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
String
cspDelDeptIds
(
String
projectNo
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
View file @
93d7e957
...
...
@@ -511,8 +511,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
}
dept
.
setClient
(
ClientNameConstants
.
CLIENT_CSP
);
this
.
save
(
dept
);
// 清理用户权限,重新获取用户的部门权限
List
<
String
>
userNames
=
sysUserMapper
.
getCspUserByDeptId
(
dept
.
getDeptId
().
toString
());
// 清理用户权限,重新获取项目下的用户的部门权限
List
<
String
>
userNames
=
sysUserMapper
.
getCspUserByProjectNo
(
dept
.
getProjectNo
());
if
(
Common
.
isNotNull
(
userNames
)){
for
(
String
us:
userNames
){
redisUtil
.
remove
(
CacheConstants
.
USER_DETAILS
+
"::"
+
us
);
...
...
@@ -630,4 +631,27 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
}
return
R
.
ok
();
}
/**
* 客户服务平台——获取项目下已删除的部门
*
* @param projectNo
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
@Override
public
String
cspDelDeptIds
(
String
projectNo
)
{
String
delDeptIds
=
""
;
List
<
SysDept
>
deptList
=
baseMapper
.
cspDelDeptIds
(
projectNo
);
if
(
Common
.
isNotNull
(
deptList
)){
for
(
SysDept
dept
:
deptList
){
delDeptIds
=
delDeptIds
.
concat
(
","
).
concat
(
dept
.
getDeptId
().
toString
());
}
}
if
(
delDeptIds
.
length
()>
0
){
delDeptIds
=
delDeptIds
.
substring
(
1
);
}
return
delDeptIds
;
}
}
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
View file @
93d7e957
...
...
@@ -155,4 +155,8 @@
</foreach>
</update>
<select
id=
"cspDelDeptIds"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"
>
select dept_id from sys_dept where del_flag = '1' AND project_no = #{projectNo}
</select>
</mapper>
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
View file @
93d7e957
...
...
@@ -448,4 +448,12 @@
where c.project_no in (SELECT project_no from sys_user_dept_permission where dept_id=#{deptId})
) and a.del_flag='0'
</select>
<select
id=
"getCspUserByProjectNo"
resultType=
"java.lang.String"
>
SELECT a.username from sys_user a
where a.user_id in (
select c.user_id from sys_user_dept_permission c
where c.project_no in (#{projectNo})
) and a.del_flag='0'
</select>
</mapper>
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