admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

获取用户信息调整

Browse Source
This commit is contained in:
pengjie 2024-12-17 10:31:03 +08:00
parent 60a6dbe6a4
commit d832a3da48
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -400,6 +400,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} }
return result; return result;
} else { } else {
String projectSn = StringUtils.isNotBlank(MapUtils.getString(map, "projectSn")) ? MapUtils.getString(map, "projectSn") : systemUser.getSn();
CompanyConfig companyConfig = null; CompanyConfig companyConfig = null;
if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.SYSTEM_ADMINISTRATOR.getValue())) { if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.SYSTEM_ADMINISTRATOR.getValue())) {
companyConfig = new CompanyConfig(); companyConfig = new CompanyConfig();
@ -418,11 +419,11 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
companyConfig.setStyleType(1); companyConfig.setStyleType(1);
companyConfig.setHeadquartersSn("-1"); companyConfig.setHeadquartersSn("-1");
} else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue()) || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) { } else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue()) || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) {
companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn()); companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn);
} else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.NEW_USER.getValue()) || systemUser.getAccountType().equals(SystemUserAccountTypeEnum.SUPPLIER.getValue())) { } else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.NEW_USER.getValue()) || systemUser.getAccountType().equals(SystemUserAccountTypeEnum.SUPPLIER.getValue())) {
companyConfig = companyConfigMapper.getCompanyConfigByHeadquartersSn(MapUtils.getString(map, "headquartersSn")); companyConfig = companyConfigMapper.getCompanyConfigByHeadquartersSn(MapUtils.getString(map, "headquartersSn"));
} else { } else {
companyConfig = companyConfigMapper.getCompanyConfigBySn(systemUser.getSn()); companyConfig = companyConfigMapper.getCompanyConfigBySn(projectSn);
} }
log.info("companyConfig：{}", JSON.toJSONString(companyConfig)); log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
if (companyConfig.getExpireTime() == null) { if (companyConfig.getExpireTime() == null) {
@ -438,7 +439,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} }
} }
if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) { if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) {
List<SystemUser> users = getProjectChildernSystemUserList(new MapBuilder<String, Object>().put("projectSn", systemUser.getSn()) List<SystemUser> users = getProjectChildernSystemUserList(new MapBuilder<String, Object>().put("projectSn", projectSn)
.put("userId", systemUser.getUserId()).build()); .put("userId", systemUser.getUserId()).build());
if (CollUtil.isNotEmpty(users)) { if (CollUtil.isNotEmpty(users)) {
systemUser.setPersonMail(users.get(0).getPersonMail()); systemUser.setPersonMail(users.get(0).getPersonMail());
@ -499,7 +500,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} else { } else {
result.put("workerId", ""); result.put("workerId", "");
} }
result.put("sn", systemUser.getSn()); result.put("sn", projectSn);
result.put("styleType", companyConfig.getStyleType()); result.put("styleType", companyConfig.getStyleType());
result.put("accountType", systemUser.getAccountType()); result.put("accountType", systemUser.getAccountType());
result.put("headquartersSn", companyConfig.getHeadquartersSn()); result.put("headquartersSn", companyConfig.getHeadquartersSn());
@ -513,7 +514,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
result.put("addProjectType", companyConfig.getAddProjectType()); result.put("addProjectType", companyConfig.getAddProjectType());
result.put("enterProjectBackType", companyConfig.getEnterProjectBackType()); result.put("enterProjectBackType", companyConfig.getEnterProjectBackType());
result.put("companyBigScreen", companyConfig.getCompanyBigScreen()); result.put("companyBigScreen", companyConfig.getCompanyBigScreen());
Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType()); Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
result.put("menuAuthority", menuAuthority); result.put("menuAuthority", menuAuthority);
result.put("scope", scope); result.put("scope", scope);
result.put("expire", false); result.put("expire", false);

BIN
src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar
View File

Binary file not shown.