Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!182

adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java

@@ -136,7 +136,10 @@ public class DataSyncController {
                 tsInstitution.setName(jsonObject.getString("orgName"));
                 tsInstitution.setHasChild(strings.contains(jsonObject.getString("orgNumber"))?"1":"0");
                 tsInstitution.setParentId(jsonObject.getString("parentOrgNumber"));
-                tsInstitutions.add(tsInstitution);
+                //部门为"null"的数据不保存
+                if (!"null".equals(jsonObject.getString("orgName"))){
+                    tsInstitutions.add(tsInstitution);
+                }
             });
             tsInstitutionService.saveBatch(tsInstitutions);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.service.impl;
 
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.person.entity.PersonMsgEO;
+import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.standardSplit.dao.*;
 import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService;
@@ -10,8 +11,11 @@ import com.adc.da.base.page.BasePage;
 import com.adc.da.common.ReadWordTable;
 import com.adc.da.slrs.standardSplit.entity.*;
 import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService;
+import com.adc.da.sys.common.SelectionResult;
 import com.adc.da.sys.util.LoginUserUtil;
 import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.utils.util.InitStandAttrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
@@ -46,6 +50,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService {
     private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class);
 
+    @Autowired
+    private ISarStandAttrDetailsService sarStandAttrDetailsEOService;
+
     @Autowired
     private IAttFileEOService attFileEOService;
     @Value("${file.path}")
@@ -588,11 +595,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
         page.getPager().setRowCount(rowCount);
         List<SarFileSplitInfoEO> rows = sarFileSplitInfoEODao.queryByPageOwn(page);
         Map<String, String> map = new HashMap<>();
-        map.put("CA", "草稿");
-        map.put("ZQYJG", "征求意见稿");
-        map.put("BPG", "报批稿");
-        map.put("SSG", "送审稿");
-        map.put("FBGBJBD", "发布稿（必读）");
+
+        List<SelectionResult> selectionResults = sarStandAttrDetailsEOService.selectFileFieldForSel(null);
+        selectionResults.forEach(detailsEO->{
+          map.put(detailsEO.getValue(),detailsEO.getLabel());
+        });
 
         if (rows != null && !rows.isEmpty()) {
             for (SarFileSplitInfoEO infoEO : rows) {