fix: 78264

企标详情-授权部门没有正常回显

laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java

@@ -712,9 +712,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         // 提前处理企标的稽查内容，否则后面转换会报错
         if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) {
             List<LinkedHashMap> checkList = (List<LinkedHashMap>) parameterMap.get(FieldCommon.CHECK_LIST);
-            List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
+            if (checkList != null) {
-            parameterMap.put(FieldCommon.CHECK_LIST, null);
+                List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
-            this.esInspectContentSaveOrUpdate(inspectContents, id, (String) parameterMap.get(FieldCommon.STANDARD_NUMBER));
+                parameterMap.put(FieldCommon.CHECK_LIST, null);
+                this.esInspectContentSaveOrUpdate(inspectContents, id, (String) parameterMap.get(FieldCommon.STANDARD_NUMBER));
+            }
         }
 
         ManyStandardSelectionBox singleStandard = getSingleStandard(null, id);
@@ -1085,6 +1087,18 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
 
+        // 企标独有的授权部门
+        LambdaQueryWrapper<EnterpriseStandardAuthDept> authDeptWrapper = new LambdaQueryWrapper<>();
+        authDeptWrapper.eq(EnterpriseStandardAuthDept::getStandardId, id);
+        List<EnterpriseStandardAuthDept> authDeptList = enterpriseAuthDeptService.list(authDeptWrapper);
+
+        // 将authDeptList的所有auth_dept取出来转换成逗号拼接的字符串
+        if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
+            String authDept = authDeptList.stream().map(EnterpriseStandardAuthDept::getAuthDept)
+                    .collect(Collectors.joining(","));
+            initMap.put(FieldCommon.AUTH_DEPT, authDept);
+        }
+
         Map<String, Object> stringObjectMap = processResultMap(initMap, fieldList);
 
         if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
@@ -1104,14 +1118,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                 }
             }
             stringObjectMap.put("checkList", list);
-            // 企标独有的授权部门
-            LambdaQueryWrapper<EnterpriseStandardAuthDept> authDeptWrapper = new LambdaQueryWrapper<>();
-            authDeptWrapper.eq(EnterpriseStandardAuthDept::getStandardId, id);
-            List<EnterpriseStandardAuthDept> authDeptList = enterpriseAuthDeptService.list(authDeptWrapper);
-            // 将authDeptList的所有auth_dept取出来转换成逗号拼接的字符串
-            String authDept = authDeptList.stream().map(EnterpriseStandardAuthDept::getAuthDept)
-                    .collect(Collectors.joining(","));
-            stringObjectMap.put(FieldCommon.AUTH_DEPT, authDept);
         }
         // 标准拆分标识
         splitFlag(stringObjectMap);