fix: 78304

企标--导入--稽查内容的整改部门带出回显

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

@@ -1114,7 +1114,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                 List<SysDepart> departList = sysDepartService.list(sysDepartLambdaQueryWrapper);
                 Map<String, List<SysDepart>> departMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getId));
                 for (EnterpriseStandardInspectContent content : list) {
-                    content.setRectificationDepartment_dictText(departMap.get(content.getRectificationDepartment()).get(0).getDepartName());
+                    if (content.getRectificationDepartment() != null) {
+                        content.setRectificationDepartment_dictText(departMap.get(content.getRectificationDepartment()).get(0).getDepartName());
+                    }
                 }
             }
             stringObjectMap.put("checkList", list);
@@ -2144,7 +2146,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
 
         // 标准内容或要求
         LawsTag rectificationDepartment = new LawsTag();
-        rectificationDepartment.setDbFieldTxt("稽查部门");
+        rectificationDepartment.setDbFieldTxt("整改部门");
         rectificationDepartment.setFieldShowType(FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue());
         rectificationDepartment.setFieldMustInput(YesOrNoEnum.NO.getValue());
         fieldList.add(rectificationDepartment);

laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java

@@ -510,7 +510,10 @@ public class ImportUtil {
                 // 获取第四行前两个单元格的内容
                 String cellContent1 = getCellContent(row.getCell(0));
                 String cellContent2 = getCellContent(row.getCell(1));
-                String cellContent3 = this.convertSingleOrgId(getCellContent(row.getCell(2)));
+                String cellContent3 = null;
+                if (StrUtil.isNotBlank(getCellContent(row.getCell(2)))) {
+                    cellContent3 = this.convertSingleOrgId(getCellContent(row.getCell(2)));
+                }
                 LinkedHashMap<String, String> inspectContentMap = new LinkedHashMap<>();
                 inspectContentMap.put("clause", cellContent1);
                 inspectContentMap.put("requirement", cellContent2);
@@ -708,10 +711,7 @@ public class ImportUtil {
         Map<String, DictModel> sexDictModelMap =
                 sysBaseAPI.getDictItems(dictCode).stream()
                         .collect(Collectors.toMap(DictModel::getText, d -> d));
-        if (sexDictModelMap.get(cellValue) == null) {
-                return false;
-        }
-        return true;
+        return sexDictModelMap.get(cellValue) != null;
     }
 
     // 字典验证（判断填写的是否是中的一个）