Browse Source

feat: 优化认证状态显示1

shc 2 năm trước cách đây
mục cha
commit
61a468d6c5

+ 15 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1517,16 +1517,25 @@ public class SysUserController {
 					List<SysUserSubVO> certList = new ArrayList<>();
 					userSubList.forEach(sysUserSub -> {
 						SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
-
-						// 不包含设置成未签约
-						if (!locations.contains(sysUserSub.getSubjectLocation())){
-							sysUserSub.setCertStatus(0);
-						}
-
 						userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus()));
 						userSubVO.setCertStatusDisplay(String.format("%s:%s", sysUserSub.getSubjectLocation().getDescription(),GigTypeEnum.getCertStatusNameByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus())));
 						certList.add(userSubVO);
 					});
+
+					List<SubjectLocation> collect = certList.stream().map(SysUserSubVO::getSubjectLocation).collect(Collectors.toList());
+
+					List<SysUserSubVO> subVOS = locations.stream().filter(loc -> !collect.contains(loc)).map(loc -> {
+								SysUserSubVO userSubVO = new SysUserSubVO();
+								userSubVO.setUserId(userVO.getUserId());
+								userSubVO.setGigType(loc.getGigType());
+								userSubVO.setSubjectLocation(loc);
+								userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(userSubVO.getGigType(), 0));
+								userSubVO.setCertStatusDisplay(String.format("%s:%s", userSubVO.getSubjectLocation().getDescription(), GigTypeEnum.getCertStatusNameByCode(userSubVO.getGigType(), 0)));
+								return userSubVO;
+							}
+					).collect(Collectors.toList());
+					certList.addAll(subVOS);
+
 					userVO.setCertList(certList);
 
 					// 不同渠道认证名称,封装成中文名称数组格式