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

soc-auth/src/main/java/com/xunmei/auth/service/FJNXLoginService.java

@@ -184,7 +184,7 @@ public class FJNXLoginService{
         }
         JSONObject accountJson = new JSONObject(accountInfo);
 
-        if("true".equals(accountJson.getStr("result"))){
+        if(!"true".equals(accountJson.getStr("result"))){
             throw new RuntimeException("验证token失败，登录失败！");
         }
 
@@ -205,7 +205,7 @@ public class FJNXLoginService{
         JSONObject userContent = new JSONObject(userJson.getStr("data"));
         String sap_user = userContent.getStr("sap_user");
 
-        JSONObject info = new JSONObject(userJson.getStr("sap_user"));
+        JSONObject info = new JSONObject(sap_user);
 
         String username = info.getStr("username");
 

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

@@ -111,6 +111,7 @@
                 where path like concat((select path from sys_org where id=#{info.orgId}),'%'))
             </if>
         </where>
+        order by id desc
     </select>
 <!--    <select id="selectChildren" parameterType="com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto"-->
 <!--            resultMap="appPlans">-->

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

@@ -20,6 +20,7 @@
                 and i.id in (select item_id from core_resumption_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
+        order by  id desc
     </select>
 
 <!--    <select id="selectDataTypeList" resultType="com.isp.dict.dto.SecBookDtInstDto">-->

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

@@ -40,7 +40,7 @@
                 </if>
             </if>
         </where>
-        order by a.create_time desc
+        order by a.id desc
     </select>
 
     <select id="getRuleGroupList" resultType="com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo">

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

@@ -260,7 +260,7 @@
 
         ) tem
         GROUP BY tem.id,tem.create_time
-        order by tem.create_time desc
+        order by tem.id desc
     </select>
     <select id="selectItemIdsByPlanId" resultType="java.lang.String">
         select distinct point_id as item_id

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

@@ -20,6 +20,7 @@
                 and i.id in (select item_id from core_safetycheck_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
+        order by i.id desc
     </select>
 
     <select id="checkItemNameRepeat" resultType="java.lang.Integer">

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

@@ -39,7 +39,7 @@
                 </if>
             </if>
         </where>
-        order by a.create_time desc
+        order by a.id desc
     </select>
 
     <select id="getRuleGroupList" resultType="com.xunmei.core.safetyCheck.vo.rule.SafetyCheckRuleGroupVo">