Merge remote-tracking branch 'origin/dev_v1.0.1' into dev_v1.0.1

sop-api/src/main/java/com/qmth/sop/server/api/TBProductController.java

@@ -48,6 +48,6 @@ public class TBProductController {
         if (productType != null) {
             queryWrapper.lambda().eq(TBProduct::getCode, productType);
         }
-        return ResultUtil.ok(tbProductService.list(queryWrapper));
+        return ResultUtil.ok(tbProductService.list(queryWrapper.lambda().orderByDesc(TBProduct::getCreateTime)));
     }
 }

sop-business/src/main/resources/mapper/SysRoleMapper.xml

@@ -33,6 +33,6 @@
             </if>
                 and t.type <![CDATA[ <> ]]> 'ADMIN'
         </where>
-        ORDER BY t.create_time
+        ORDER BY t.update_time desc
     </select>
 </mapper>

sop-business/src/main/resources/mapper/SysUserMapper.xml

@@ -251,7 +251,7 @@
             </if>
                 and a.source = 'SYSTEM'
         </where>
-        order by a.create_time desc
+        order by a.update_time desc
     </select>
 
     <select id="queryUser" resultType="com.qmth.sop.business.bean.dto.FormWidgetDto">

sop-business/src/main/resources/mapper/TBDelayWarnMapper.xml

@@ -95,7 +95,8 @@
         tbdw.create_id as createId,
         su.real_name as createRealName,
         tbdw.create_time as createTime,
-        'DELAY_WARN' as warnType
+        'DELAY_WARN' as warnType,
+        tbdw.update_time as updateTime
         from t_b_delay_warn tbdw
         left join t_b_crm tbc on tbc.crm_no = tbdw.crm_no
         left join t_b_service tbs on tbs.id = tbc.service_id
@@ -141,7 +142,7 @@
 
     <select id="getWarnTaskList" resultType="com.qmth.sop.business.bean.result.WorkWarnResult">
         select t.* from
-        <include refid="warnTaskListCommonSql" /> order by t.code desc
+        <include refid="warnTaskListCommonSql" /> order by t.code desc,t.updateTime desc
     </select>
 
     <select id="getWarnTaskListCount" resultType="java.lang.Integer">

sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="flowTaskUnDoneList" resultType="com.qmth.sop.business.bean.result.DingApplyUnDoneResult">
         <include refid="flowTaskUnDoneListHeader"/>
-        <include refid="flowTaskUnDoneListFoot" /> order by tfcfe.code desc
+        <include refid="flowTaskUnDoneListFoot" /> order by tfcfe.code,tfcfe.create_time desc
     </select>
 
     <sql id="flowTaskUnDoneListHeader">
@@ -239,6 +239,6 @@
                 </choose>
             </if>
         </where>
-            order by tfcfe.code desc
+            order by tfcfe.code desc,tbda.create_time desc
     </select>
 </mapper>

sop-business/src/main/resources/mapper/TBProjectExchangeMapper.xml

@@ -99,6 +99,6 @@
                 </choose>
             </if>
         </where>
-        order by tbpe.exchange_no desc
+        order by tbpe.exchange_no desc,tbpe.create_time desc
     </select>
 </mapper>

sop-business/src/main/resources/mapper/TBQualityProblemApplyMapper.xml

@@ -90,7 +90,7 @@
                 </choose>
             </if>
         </where>
-        ORDER BY a.problem_no desc
+        ORDER BY a.problem_no desc,a.update_time desc
     </select>
 
     <select id="userList" resultType="com.qmth.sop.business.entity.SysUser">

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -168,7 +168,7 @@
                  order by ${fieldOrder}
              </when>
              <otherwise>
-                 order by tbsi.sop_no desc
+                 order by tbsi.sop_no desc,tbsi.update_time desc
              </otherwise>
          </choose>
     </select>

sop-business/src/main/resources/mapper/TBTaskMapper.xml

@@ -27,6 +27,6 @@
                 and tbt.result = #{result}
             </if>
         </where>
-        order by tbt.create_time desc
+        order by tbt.update_time desc
     </select>
 </mapper>