commit

src/main/resources/mapper/dmp/DmpDevelopTaskMapper.xml

@@ -170,8 +170,8 @@
                 t1.name as taskName,
                 t1.type,
                 t1.create_user_id as createUserId,
-                date_format(t1.create_time,'%Y-%m-%d %H:%i:%s') as createTime,
-                date_format(t1.update_time,'%Y-%m-%d %H:%i:%s') as updateTime,
+                date_format(t2.create_time,'%Y-%m-%d %H:%i:%s') as createTime,
+                date_format(t2.update_time,'%Y-%m-%d %H:%i:%s') as updateTime,
                 t3.real_name as userName
             from
                 dmp_navigation_tree t1
@@ -182,6 +182,7 @@
             <if test="taskId != null and taskId != ''"> and t2.id =#{taskId} </if>
             <if test="treeIdOrName != null and treeIdOrName != ''"> and t1.name like concat('%',#{treeIdOrName},'%') </if>
             <if test="taskType != null and taskType!= ''"> and t1.type=#{taskType} </if>
+            order by t2.create_time desc
     </select>
     
     <select id="findList" resultMap="DmpDevelopTaskResultMap">

src/main/resources/mapper/dmp/DmpSyncingDatasourceMapper.xml

@@ -302,6 +302,7 @@
         and a.project_id = #{projectId}
         <if test="datasourceTypeId != null and datasourceTypeId !=''">and a.datasource_type = #{datasourceTypeId}</if>
         <if test="datasourceName != null and datasourceName !=''">and a.datasource_name like CONCAT('%',#{datasourceName},'%')</if>
+        order by a.create_time desc
     </select>
 
     <!--批量删除-->

src/main/resources/mapper/dmp/OfflineSynchMapper.xml

@@ -179,7 +179,6 @@
        FROM dmp_develop_task  ddt
         INNER join dmp_navigation_tree  dnt ON ddt.TREE_ID = dnt.ID
         left join dmp_member t3 on ddt.create_user_id=t3.user_id
-        left join dmp_syncing_datasource  dsd ON instr(script,concat('"targetDbConnection":"',dsd.datasource_name,'"'))>0
         WHERE ddt.data_status ='1' and dnt.TYPE ='01' and dnt.IS_LEVEL ='1'
         and dnt.PROJECT_ID =#{projectId}
         <if test="treeName != null and treeName != ''">dnt.NAME like concat('%',#{treeName},'%') </if>