feat: 用户列表认证状态只显示启用的

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

@@ -1524,26 +1524,28 @@ public class SysUserController {
 				if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(locations)) {
 					// 不同渠道认证信息列表
 					List<SysUserSubVO> certList = new ArrayList<>();
-					userSubList.forEach(sysUserSub -> {
+					userSubList.stream()
+							.filter(userSub -> !locations.contains(userSub.getSubjectLocation()))
+							.forEach(sysUserSub -> {
 						SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
 						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);
+//					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);