Merge remote-tracking branch 'origin/master' into feature/syp_workLogs

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml

@@ -53,7 +53,7 @@
          <if test="type!=null and type!='' and type == '2'.toString()">
             and t.USER_ID = #{userId}
         </if>
-        order by sort,CREATED_TIME desc
+        order by sort,DEPARTURE_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <select id="getSdsDetail" resultType="com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO">

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml

@@ -31,7 +31,7 @@
 
     <select id="getListToShow" resultType="com.elink.esua.epdc.entity.ModuleCategoryEntity">
          select t1.*,t1.id as value,t1.category_name as label,(select t2.category_name from epdc_module_category t2 where t2.id=t1.pid)parentName from epdc_module_category t1
- where t1.del_flag = '0' and t1.ENABLE_FLAG = '1' and CATEGORY_TYPE != 'module_category_type_button'
+ where t1.del_flag = '0' and t1.ENABLE_FLAG = '1'
         order by t1.sort asc
     </select>
     <select id="selectListCategoryTreeDTO" resultType="com.elink.esua.epdc.dto.ModuleCategoryTreeDTO">
@@ -89,4 +89,4 @@
     </select>
 
 
-</mapper>
+</mapper>