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
4c4a6906
Commit
4c4a6906
authored
Apr 14, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9-fxj' into MVP1.7.9-fxj
parents
d47be345
f9cce4ed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+11
-4
SysUserPermissionServiceImpl.java
...permission/service/impl/SysUserPermissionServiceImpl.java
+1
-1
SysUserPermissionMapper.xml
...biz/src/main/resources/mapper/SysUserPermissionMapper.xml
+5
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
4c4a6906
...
@@ -423,13 +423,13 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -423,13 +423,13 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
* @return
* @return
**/
**/
public
boolean
saveForEkp
(
List
<
SysUser
>
userIds
,
TSettleDomain
domain
){
public
boolean
saveForEkp
(
List
<
SysUser
>
userIds
,
TSettleDomain
domain
){
// 1. 先清除现有的这些人的项目权限
permissonMapper
.
delete
(
Wrappers
.<
TCutsomerDataPermisson
>
query
().
lambda
()
.
in
(
TCutsomerDataPermisson:
:
getUserId
,
userIds
)
.
eq
(
TCutsomerDataPermisson:
:
getSettleDomainId
,
domain
.
getId
()));
// 2.新增新的项目人员权限
// 2.新增新的项目人员权限
TCutsomerDataPermisson
pm
;
TCutsomerDataPermisson
pm
;
if
(
Common
.
isNotNull
(
userIds
))
{
if
(
Common
.
isNotNull
(
userIds
))
{
// 1. 先清除现有的这些人的项目权限
permissonMapper
.
delete
(
Wrappers
.<
TCutsomerDataPermisson
>
query
().
lambda
()
.
in
(
TCutsomerDataPermisson:
:
getUserId
,
userIds
.
stream
().
map
(
SysUser:
:
getUserId
).
collect
(
Collectors
.
toList
()))
.
eq
(
TCutsomerDataPermisson:
:
getSettleDomainId
,
domain
.
getId
()));
for
(
SysUser
user
:
userIds
){
for
(
SysUser
user
:
userIds
){
pm
=
new
TCutsomerDataPermisson
();
pm
=
new
TCutsomerDataPermisson
();
pm
.
setStatus
(
CommonConstants
.
ZERO_STRING
);
pm
.
setStatus
(
CommonConstants
.
ZERO_STRING
);
...
@@ -507,6 +507,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -507,6 +507,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
domain
.
setDepartName
(
tSettleDomainInfo
.
getDepartName
());
domain
.
setDepartName
(
tSettleDomainInfo
.
getDepartName
());
domain
.
setId
(
tSettleDomainInfo
.
getId
());
domain
.
setId
(
tSettleDomainInfo
.
getId
());
initServerTeamPermission
(
domain
);
initServerTeamPermission
(
domain
);
tSettleDomainInfo
.
setProjectManagerName
(
domain
.
getProjectManagerName
());
tSettleDomainInfo
.
setProjectManager
(
domain
.
getProjectManager
());
baseMapper
.
updateById
(
tSettleDomainInfo
);
}
}
}
}
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
...
@@ -538,6 +541,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -538,6 +541,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
// 先清理缓存
// 先清理缓存
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
//项目负责人目前只有一个,如果有多个这个地方需要特殊处理
if
(
res
.
getData
().
getUserList
().
size
()
>=
CommonConstants
.
ONE_INT
){
domain
.
setProjectManagerName
(
res
.
getData
().
getUserList
().
get
(
0
).
getNickname
());
}
saveForEkp
(
res
.
getData
().
getUserList
(),
domain
);
saveForEkp
(
res
.
getData
().
getUserList
(),
domain
);
}
}
}
}
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java
View file @
4c4a6906
...
@@ -483,7 +483,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -483,7 +483,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
case
"项目"
:
case
"项目"
:
deleteType
=
CommonConstants
.
dingleDigitStrArray
[
5
];
deleteType
=
CommonConstants
.
dingleDigitStrArray
[
5
];
list
=
baseMapper
.
getUserPermissionByAutoCreateXM
(
fdId
);
break
;
list
=
baseMapper
.
getUserPermissionByAutoCreateXM
(
fdId
);
break
;
case
"项目变更"
:
case
"项目变更"
:
//项目服务团队及项目负责人变更 fxj 20250410 V1.7.9
deleteType
=
CommonConstants
.
dingleDigitStrArray
[
5
];
deleteType
=
CommonConstants
.
dingleDigitStrArray
[
5
];
list
=
baseMapper
.
getUserPermissionByAutoCreateXMBG
(
fdId
);
break
;
list
=
baseMapper
.
getUserPermissionByAutoCreateXMBG
(
fdId
);
break
;
default
:
default
:
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml
View file @
4c4a6906
...
@@ -454,18 +454,19 @@
...
@@ -454,18 +454,19 @@
,'5' PERMISSION_TYPE,d.fd_3b8797876dc13c_text NAME,d.fd_3b879793d37afe CODE,0 SOURCE_TYPE
,'5' PERMISSION_TYPE,d.fd_3b8797876dc13c_text NAME,d.fd_3b879793d37afe CODE,0 SOURCE_TYPE
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
from ekp_d701e3e72794ff390ca8 d
from ekp_d701e3e72794ff390ca8 d
LEFT JOIN ekporg_1
8622320f73771d520db
f on f.fd_parent_id = d.fd_id
LEFT JOIN ekporg_1
95eb1d6815b96ceb269
f on f.fd_parent_id = d.fd_id
LEFT JOIN sys_org_element e on e.fd_id = f.sys_org_person_id JOIN sys_org_person p on e.fd_id=p.fd_id
LEFT JOIN sys_org_element e on e.fd_id = f.sys_org_person_id JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId}
where d.fd_id = #{fdId}
union
all
union
ALL
select
select
e.fd_name EMP_NAME,p.fd_login_name EMP_LOGIN_NAME,SUBSTRING_INDEX(SUBSTRING_INDEX(e.fd_ldap_dn,',ou', 2),',ou=', -1) EMP_DEPT
e.fd_name EMP_NAME,p.fd_login_name EMP_LOGIN_NAME,SUBSTRING_INDEX(SUBSTRING_INDEX(e.fd_ldap_dn,',ou', 2),',ou=', -1) EMP_DEPT
,'5' PERMISSION_TYPE,d.fd_3b8797876dc13c_text NAME,d.fd_3b879793d37afe CODE,0 SOURCE_TYPE
,'5' PERMISSION_TYPE,d.fd_3b8797876dc13c_text NAME,d.fd_3b879793d37afe CODE,0 SOURCE_TYPE
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
from ekp_d701e3e72794ff390ca8 d
from ekp_d701e3e72794ff390ca8 d
LEFT JOIN
ekp_24a8e6a7fc143bb8c48a f on f.fd_3a37fe508071fe = d.fd_3b879793d37afe
LEFT JOIN
sys_org_element e on e.fd_id = d.fd_changeafter
LEFT JOIN sys_org_element e on e.fd_id = f.fd_3b212a2d7a65c6
JOIN sys_org_person p on e.fd_id=p.fd_id
JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId}
where d.fd_id = #{fdId}
) a GROUP BY a.USER_ID
) a GROUP BY a.USER_ID
</select>
</select>
...
...
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