Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
a1d19869
Commit
a1d19869
authored
Jul 10, 2024
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug 20138 【web端-经销商人员管理】人员编辑,当人员参与业务的时候,区域公司应该不可以修改(还有角色是不是只能增加不能删除,机构呢),否则数据会乱掉
parent
bcc73203
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
5 deletions
+21
-5
UserDataJBDto.java
.../yeejoin/amos/boot/module/hygf/api/dto/UserDataJBDto.java
+6
-1
UserDataZHDto.java
.../yeejoin/amos/boot/module/hygf/api/dto/UserDataZHDto.java
+4
-0
UnitInfoMapper.xml
...gf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml
+1
-3
PersonnelBusinessServiceImpl.java
...e/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
+10
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserDataJBDto.java
View file @
a1d19869
...
...
@@ -33,5 +33,10 @@ public class UserDataJBDto {
* 是否有业务操作
*/
private
Boolean
hasOperationRecords
;
private
List
<
Long
>
role
;
/**
* 是否允许修改
*/
private
String
unallowModify
;
private
String
pageType
;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserDataZHDto.java
View file @
a1d19869
...
...
@@ -20,4 +20,8 @@ public class UserDataZHDto {
* 是否有业务操作
*/
private
Boolean
hasOperationRecords
;
/**
* 是否允许修改
*/
private
String
unallowModify
;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml
View file @
a1d19869
...
...
@@ -66,9 +66,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<select
id=
"getuserListByOrgCode"
resultType=
"Map"
>
select
<!-- 2024/07/05 沟通后不用去重 -->
<!-- DISTINCT std_user_biz.real_name realName-->
std_user_biz.real_name realName
DISTINCT std_user_biz.real_name realName
from
std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @
a1d19869
...
...
@@ -505,7 +505,16 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
Boolean
hasOperationRecords
=
hasOperationRecords
(
id
);
userDataZHDto
.
setHasOperationRecords
(
hasOperationRecords
);
userDataJBDto
.
setHasOperationRecords
(
hasOperationRecords
);
userDataJBDto
.
setRole
(
JSONArray
.
parseArray
(
publicAgencyUse
.
getRole
(),
long
.
class
));
userDataJBDto
.
setPageType
(
"look"
);
if
(
publicAgencyUse
.
getRole
().
contains
(
userGroupempty
+
""
))
{
// 如果是空角色,区域公司和角色可以修改
userDataZHDto
.
setUnallowModify
(
"unallow"
);
userDataJBDto
.
setUnallowModify
(
"unallow"
);
}
else
{
// 有业务参与不可以编辑
userDataZHDto
.
setUnallowModify
(
hasOperationRecords
?
"allow"
:
"unallow"
);
userDataJBDto
.
setUnallowModify
(
hasOperationRecords
?
"allow"
:
"unallow"
);
}
return
new
UserDataDto
(
userDataZHDto
,
userDataJBDto
,
userDataZZDto
);
}
...
...
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