feat: 用户列表认证状态修改

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

@@ -1464,13 +1464,17 @@ public class SysUserController {
 		}
 
 		// 封装用户签约认证主体信息
-		SysDept dept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+		SysDeptSub sysDeptSub = new SysDeptSub();
+		sysDeptSub.setDeptId(SecurityUtils.getUser().getDeptId());
+		sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+		List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.query(sysDeptSub));
+
 		userVosPage.getRecords().forEach(userVO -> {
 			List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, userVO.getUserId()));
-			if (CollUtil.isNotEmpty(userSubList) && ArrayUtil.isNotEmpty(dept.getSubjectType())) {
+			if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(subList)) {
 				Map<GigTypeEnum, String> certStatusMap = userSubList.stream()
-						.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType(),
+						.collect(Collectors.toMap(SysUserSub::getGigType,
 								sysUserSub -> {
 									String certStatuName = "";
 									switch (sysUserSub.getGigType()) {
@@ -1491,20 +1495,21 @@ public class SysUserController {
 									}
 									return certStatuName;
 								}));
+				List<String> subTypeList = subList.stream().map(SysDeptSub::getSubjectType).collect(Collectors.toList());
 				List<String> certStatusNameList = new ArrayList<>();
-				if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.REN_LI_JIA.getCode())) {
+				if (subTypeList.contains(String.valueOf(GigTypeEnum.REN_LI_JIA.getCode()))) {
 					certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.REN_LI_JIA)) ?
 							RenlijiaCertStatus.CER_STATUS_4.getMessage() : certStatusMap.get(GigTypeEnum.REN_LI_JIA));
 				}
-				if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.TAX_HELPOR.getCode())) {
+				if (subTypeList.contains(String.valueOf(GigTypeEnum.TAX_HELPOR.getCode()))) {
 					certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.TAX_HELPOR)) ?
 							TaxHelperCertStatus.UN_CERT.getDesc() : certStatusMap.get(GigTypeEnum.TAX_HELPOR));
 				}
-				if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.YEE.getCode())) {
+				if (subTypeList.contains(String.valueOf(GigTypeEnum.YEE.getCode()))) {
 					certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.YEE)) ?
 							YeeCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.YEE));
 				}
-				if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.OLADING.getCode())) {
+				if (subTypeList.contains(String.valueOf(GigTypeEnum.OLADING.getCode()))) {
 					certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.OLADING)) ?
 							YeeCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.OLADING));
 				}