Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -233,7 +233,7 @@ public class ScheduledJob {
                 .eq("VALID_FLAG","0")
                 .ne("DTBJH","");
         //查询代替标准字段得到一个 被代替了的标准的id的键值对列表
-        List<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH).subList(0,100);
+        List<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH);
         HashMap<String, Integer> replaceIdCountMap = new HashMap<>();
 
 
@@ -270,9 +270,9 @@ public class ScheduledJob {
 
                             List<String> standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH);
                             if (standId.size() > 0) {
-
+                                boolean b = replaceIdCountMap.containsKey(standId.get(0));
                                 //如果代替标准id已存在则映射为2不存在则添加并映射为1
-                                if (replaceIdCountMap.containsKey(standId)) {
+                                if (b) {
                                     replaceIdCountMap.replace(standId.get(0), 2);
                                 } else {
                                     replaceIdCountMap.put(standId.get(0), 1);