Commit 98c9b51f authored by yangyang's avatar yangyang

fixed bug 20765 【web端-经销商人员管理】管理员置换出去,重新编辑,无法编辑

parent 6e144e44
...@@ -33,4 +33,5 @@ public class UserDataJBDto { ...@@ -33,4 +33,5 @@ public class UserDataJBDto {
* 是否有业务操作 * 是否有业务操作
*/ */
private Boolean hasOperationRecords; private Boolean hasOperationRecords;
private List<Long> role;
} }
...@@ -505,6 +505,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -505,6 +505,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
Boolean hasOperationRecords = hasOperationRecords(id); Boolean hasOperationRecords = hasOperationRecords(id);
userDataZHDto.setHasOperationRecords(hasOperationRecords); userDataZHDto.setHasOperationRecords(hasOperationRecords);
userDataJBDto.setHasOperationRecords(hasOperationRecords); userDataJBDto.setHasOperationRecords(hasOperationRecords);
userDataJBDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto); return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto);
} }
...@@ -529,6 +530,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -529,6 +530,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
List<String> tableName = personnelBusinessMapper.selectHygfTableName(); List<String> tableName = personnelBusinessMapper.selectHygfTableName();
if (CollectionUtil.isNotEmpty(tableName)) { if (CollectionUtil.isNotEmpty(tableName)) {
for (String table : tableName) { for (String table : tableName) {
// 排除人员业务信息表, 经销商人员信息, 人员消息
if ("hygf_personnel_business".equals(table) || "hygf_unit_info".equals(table) || "hygf_user_message".equals(table)) {
continue;
}
int count = personnelBusinessMapper.countByUserId(table, userId); int count = personnelBusinessMapper.countByUserId(table, userId);
if (count > 0) { if (count > 0) {
operateRecord = true; operateRecord = true;
......
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