feat: bug修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/TZSCommonServiceImpl.java

@@ -78,6 +78,7 @@ public class TZSCommonServiceImpl {
                 String nearStr = licensesStatusMap.get(near);
                 String normalStr = licensesStatusMap.get(normal);
                 String noneStr = licensesStatusMap.get(none);
+                String noLicenseStr = licensesStatusMap.get(noLicense);
                 if (!ObjectUtils.isEmpty(licenses)) {
                     if (!"".equals(licensesStatusStr)) {
                         licensesStatus = licensesStatusMap.get(licensesStatusStr);
@@ -85,6 +86,10 @@ public class TZSCommonServiceImpl {
                         List<String> permissionStatusList = new ArrayList<>();
                         for (Object object : licenses) {
                             JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(object));
+                            if(!json.containsKey("certNo")){
+                                permissionStatusList.add(noLicenseStr);
+                                continue;
+                            }
                             if (!json.containsKey("expiryDate")) {
                                 permissionStatusList.add(noneStr);
                                 continue;
@@ -101,23 +106,26 @@ public class TZSCommonServiceImpl {
                                 }
                             }
                         }
-                        long cq = permissionStatusList.stream().filter(e -> e.equals(overdueStr)).count();
-                        long lq = permissionStatusList.stream().filter(e -> e.equals(nearStr)).count();
-                        long no = permissionStatusList.stream().filter(e -> e.equals(noneStr)).count();
-                        long zc = permissionStatusList.stream().filter(e -> e.equals(normalStr)).count();
-                        // 需按照资质严重顺序进行判断，先判断超期，再判断临期，再判断无有效期，最后判断正常
-                        if (cq > 0) {
+                        long overdue = permissionStatusList.stream().filter(e -> e.equals(overdueStr)).count();
+                        long near = permissionStatusList.stream().filter(e -> e.equals(nearStr)).count();
+                        long no = permissionStatusList.stream().filter(e -> e.equals(noLicenseStr)).count();
+                        long none = permissionStatusList.stream().filter(e -> e.equals(noneStr)).count();
+                        long normal = permissionStatusList.stream().filter(e -> e.equals(normalStr)).count();
+                        // 需按照资质严重顺序进行判断，先判断超期，再判断临期，在判断无资质，再判断无有效期，最后判断正常
+                        if (overdue > 0) {
                             licensesStatus = overdueStr;
-                        } else if (lq > 0) {
+                        } else if (near > 0) {
                             licensesStatus = nearStr;
                         } else if (no > 0) {
+                            licensesStatus = noLicenseStr;
+                        } else if (none > 0) {
                             licensesStatus = noneStr;
-                        } else if (zc > 0) {
+                        } else if (normal > 0) {
                             licensesStatus = normalStr;
                         }
                     }
                 } else {
-                    licensesStatus = licensesStatusMap.get(noLicense);
+                    licensesStatus = noLicenseStr;
                 }
             } else {
                 licensesStatus = !"".equals(licensesStatusStr) ? licensesStatusMap.get(licensesStatusStr) : licensesStatusMap.get(noLicenseReq);