|
@@ -21,6 +21,7 @@ package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
+import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.IdcardUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
@@ -1463,10 +1464,11 @@ public class SysUserController {
|
|
|
}
|
|
|
|
|
|
// 封装用户签约认证主体信息
|
|
|
+ SysDept dept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
|
|
|
userVosPage.getRecords().forEach(userVO -> {
|
|
|
List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
.eq(SysUserSub::getUserId, userVO.getUserId()));
|
|
|
- if (CollUtil.isNotEmpty(userSubList)) {
|
|
|
+ if (CollUtil.isNotEmpty(userSubList) && ArrayUtil.isNotEmpty(dept.getSubjectType())) {
|
|
|
Map<GigTypeEnum, String> certStatusMap = userSubList.stream()
|
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType(),
|
|
|
sysUserSub -> {
|
|
@@ -1490,17 +1492,21 @@ public class SysUserController {
|
|
|
return certStatuName;
|
|
|
}));
|
|
|
List<String> certStatusNameList = new ArrayList<>();
|
|
|
- if (StrUtil.isNotBlank(certStatusMap.get(GigTypeEnum.REN_LI_JIA))) {
|
|
|
- certStatusNameList.add(certStatusMap.get(GigTypeEnum.REN_LI_JIA));
|
|
|
+ if (ArrayUtil.contains(dept.getSubjectType(), 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 (StrUtil.isNotBlank(certStatusMap.get(GigTypeEnum.TAX_HELPOR))) {
|
|
|
- certStatusNameList.add(certStatusMap.get(GigTypeEnum.TAX_HELPOR));
|
|
|
+ if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.TAX_HELPOR.getCode())) {
|
|
|
+ certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.TAX_HELPOR)) ?
|
|
|
+ TaxHelperCertStatus.UN_CERT.getDesc() : certStatusMap.get(GigTypeEnum.TAX_HELPOR));
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(certStatusMap.get(GigTypeEnum.YEE))) {
|
|
|
- certStatusNameList.add(certStatusMap.get(GigTypeEnum.YEE));
|
|
|
+ if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.YEE.getCode())) {
|
|
|
+ certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.YEE)) ?
|
|
|
+ YeeCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.YEE));
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(certStatusMap.get(GigTypeEnum.YEE))) {
|
|
|
- certStatusNameList.add(certStatusMap.get(GigTypeEnum.OLADING));
|
|
|
+ if (ArrayUtil.contains(dept.getSubjectType(), GigTypeEnum.OLADING.getCode())) {
|
|
|
+ certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.OLADING)) ?
|
|
|
+ YeeCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.OLADING));
|
|
|
}
|
|
|
userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
|
|
|
}
|