fix: agent dup deptId error

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -754,7 +754,7 @@ public class ApiController {
 			csmMap = deptCsms.stream().collect(Collectors.groupingBy(SysDeptCsm::getDeptId));
 		}
 		Map<String, WmDaDrugEnt> drugEntMap = wmDaDrugEntService.list().stream().collect(Collectors.toMap(WmDaDrugEnt::getDeptId, Function.identity()));
-		Map<String, WmDaAgent> agentMap = wmDaAgentService.list().stream().collect(Collectors.toMap(WmDaAgent::getDeptId, Function.identity()));
+		Map<String, List<WmDaAgent>> agentMap = wmDaAgentService.list().stream().collect(Collectors.groupingBy(WmDaAgent::getDeptId));
 
 
 
@@ -776,9 +776,15 @@ public class ApiController {
 			mapOne.put("userSign", sysU.getUserSign());
 			mapOne.put("certRemark", sysU.getCertRemark());
 			mapOne.put("taxHelperAgreementSignature", sysU.getTaxHelperAgreementSignature());
+			mapOne.put("avatar", StrUtil.isBlank(sysU.getAvatar()) ? avatar : sysU.getAvatar());
 			mapOne.put("bankCardNumber", sysU.getBankCardNumber());
 			mapOne.put("bankPhone", sysU.getBankPhone());
 			mapOne.put("bankName", sysU.getBankName());
+			mapOne.put("temp1", String.valueOf(sysU.getTemp1()));
+			mapOne.put("temp2", String.valueOf(sysU.getTemp2()));
+			mapOne.put("temp3", String.valueOf(sysU.getTemp3()));
+			mapOne.put("temp4", String.valueOf(sysU.getTemp4()));
+			mapOne.put("temp5", String.valueOf(sysU.getTemp5()));
 
 			int paid = 0;
 			int unpaid = 0;
@@ -806,8 +812,6 @@ public class ApiController {
 				mapOne.put("userNewFlag", true);
 			}
 
-			mapOne.put("avatar", StrUtil.isBlank(sysU.getAvatar()) ? avatar : sysU.getAvatar());
-
 			// 获取部门信息 && 获取csm信息 && 管理者
 			Integer deptId = sysU.getDeptId();
 			SysDept sysDept =deptMap.get(deptId);
@@ -816,7 +820,7 @@ public class ApiController {
 			mapOne.put("deptName", sysDept.getName());
 			mapOne.put("csm", deptCsm);
 
-			String management = (sysDept.getLevel() == 2) ? drugEntMap.get(deptId.toString()).getManagement() : agentMap.get(deptId.toString()).getManagement();
+			String management = (sysDept.getLevel() == 2) ? drugEntMap.get(deptId.toString()).getManagement() : agentMap.get(deptId.toString()).get(0).getManagement();
 			mapOne.put("management", management);
 
 			// 小程序角色:5-全职学术信息沟通专员, 6-兼职学术信息沟通专员, 10-兼职CRC, 13-HCP, 31-招商经理
@@ -825,6 +829,7 @@ public class ApiController {
 							.filter(item -> item.getRoleId() == 5 || item.getRoleId() == 6 || item.getRoleId() == 10 || item.getRoleId() == 13 || item.getRoleId() == 31)
 							.map(SysRole::getRoleId).collect(Collectors.toList());
 
+			mapOne.put("roles", roleIdList);
 			boolean managementFlag = ("2".equals(management) && roleIdList.contains(5)) || ("3".equals(management) && (roleIdList.contains(6) || roleIdList.contains(10))) || ("4".equals(management));
 			mapOne.put("managementFlag", managementFlag);
 
@@ -834,13 +839,6 @@ public class ApiController {
 				mapOne.put("drugEntName", wmDaDrugEnt.getEntname());
 			}
 
-			mapOne.put("roles", roleIdList);
-			mapOne.put("temp1", String.valueOf(sysU.getTemp1()));
-			mapOne.put("temp2", String.valueOf(sysU.getTemp2()));
-			mapOne.put("temp3", String.valueOf(sysU.getTemp3()));
-			mapOne.put("temp4", String.valueOf(sysU.getTemp4()));
-			mapOne.put("temp5", String.valueOf(sysU.getTemp5()));
-
 			// 查询待审核包
 			List<WmScorePackageStatus> statusList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
 					.eq(WmScorePackageStatus::getUserId, String.valueOf(sysU.getUserId()))