Explorar el Código

bugFix 解决树明排序不正确的问题

xiahan hace 1 año
padre
commit
67936c98d3

+ 1 - 1
cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafeAttachmentsServiceImpl.java

@@ -258,7 +258,7 @@ public class AspSafeAttachmentsServiceImpl extends ServiceImpl<AspSafeAttachment
         aspSafeAttachmentsDo.setMainid(checkAreaMap.get(vo.getTreeName()));
         aspSafeAttachmentsDo.setUseshopid(orgMap.get(vo.getUseshop()));
         // 时间转换
-        if (StringUtils.isBlank(vo.getManufacturestr())) {
+        if (StringUtils.isNotBlank(vo.getManufacturestr())) {
             aspSafeAttachmentsDo.setManufacturedate(dateFormatValidation(vo.getManufacturestr()));
         }
 

+ 1 - 1
cx-safe-check/cx-save-check-common/src/main/resources/mybatis/SaveCheckCommonDao.xml

@@ -121,7 +121,7 @@
         SELECT
             acia.AREANAME,
             acia.ID as id,
-            IFNULL(CONCAT(GROUP_CONCAT(b.AREANAME separator '/'),'/',acia.AREANAME),acia.AREANAME) as name
+            IFNULL(CONCAT(GROUP_CONCAT(b.AREANAME order by b.TREECODE separator '/'),'/',acia.AREANAME),acia.AREANAME) as name
         FROM
             asp_check_items_area acia
                 LEFT JOIN asp_check_items_area  b ON  FIND_IN_SET(b.ID,acia.FULLPID) and b.DELETED='0'