Commit a1d19869 authored by yangyang's avatar yangyang

fixed bug 20138 【web端-经销商人员管理】人员编辑,当人员参与业务的时候,区域公司应该不可以修改(还有角色是不是只能增加不能删除,机构呢),否则数据会乱掉

parent bcc73203
......@@ -33,5 +33,10 @@ public class UserDataJBDto {
* 是否有业务操作
*/
private Boolean hasOperationRecords;
private List<Long> role;
/**
* 是否允许修改
*/
private String unallowModify;
private String pageType;
}
......@@ -20,4 +20,8 @@ public class UserDataZHDto {
* 是否有业务操作
*/
private Boolean hasOperationRecords;
/**
* 是否允许修改
*/
private String unallowModify;
}
......@@ -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
......
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment