Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -223,6 +223,7 @@ public class SafetyCheckRuleItemServiceImpl
                 .name(parent.getName())
                 .shortName(parent.getShortName())
                 .children(new ArrayList<>())
+                .sort(parent.getSort())
                 .build();
         List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
                 .map(o -> RuleTreeItem.builder()
@@ -230,6 +231,7 @@ public class SafetyCheckRuleItemServiceImpl
                         .id(o.getId())
                         .name(o.getName())
                         .shortName(o.getName())
+                        .sort(-1)
                         .orgType(o.getOrgType()).build())
                 .collect(Collectors.toList());
         item.getChildren().addAll(ruleItems);

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectDataListByItemId" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto">
         select p.*,a.name as areaName
         from core_resumption_rule_point p
-                 inner join sys_area a on p.area_id = a.id
+        left join sys_area a on p.area_id = a.id
         where item_id = #{id}
           and p.deleted = 0
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRulePointMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectDataListByItemId" resultType="com.xunmei.core.safetyCheck.dto.rulePoint.SafetyCheckRulePointDetailDto">
         select p.*,a.name as areaName
         from core_safetycheck_rule_point p
-        inner join sys_area a on p.area_id = a.id
+        left join sys_area a on p.area_id = a.id
         where item_id = #{id}
           and p.deleted = 0
     </select>