Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml

@@ -118,7 +118,7 @@
             (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
             IS_DISABLE
          FROM ISSUE_PROJECT_TAG_DICT
-        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '0'
+        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '1'
     </select>
 
     <select id="selectDefault" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -38,7 +38,7 @@
                              GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
         WHERE p.DEL_FLAG = '0'
         AND p.status = 'pending'
-        ORDER BY p.CREATED_TIME ASC
+        ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序（带奇峰修改） -->
         LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">