Merge branch 'develop_bugfix@dl' into develop_dl_4.0

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1243,9 +1243,9 @@
         (
         IF
         (
-        (
-        concat( cfp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1823,1824,1825,1826,1827', ',', ',|' ), ',' ) > 0
-        AND concat( cfp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425', ',', ',|' ), ',' ) > 0
+        (concat( cfp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1823,1824,1825,1826,1827', ',', ',|' ), ',' ) > 0
+        OR concat( cfp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425', ',', ',|' ), ',' ) > 0
+        OR concat( cfp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1426,1427,1428,1429,1430,1431', ',', ',|' ), ',' ) > 0
         ),
         1,
         0

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2401,7 +2401,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             List<String> allTimeListNew = new ArrayList<>();
             for (int i = 0; i < allTimeList.size(); i++) {
                 if (!ObjectUtils.isEmpty(dateValueDataMap) && dateValueDataMap.containsKey(allTimeList.get(i))) {
-                    lastValue = dateValueDataMap.get(allTimeList.get(i));
+                    boolean isNum = StringUtil.isNumeric(allTimeList.get(i));
+                    if (isNum) {
+                        lastValue = dateValueDataMap.get(allTimeList.get(i));
+                    }
                 }
                 values.add(lastValue);