提交代码

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ActionLogMapper.java

@@ -19,7 +19,7 @@ public interface ActionLogMapper extends BaseMapper<ActionLog> {
 
     @Select("select a.*,u.`name` userName from action_log a left join `user` u on a.user_id = u.id where code = 'clue' and item_id = #{id}")
     List<ActionLog> selectByInfoList(Integer id);
-    @Select("select a.*,u.`name` userName from action_log a left join `user` u on a.user_id = u.id where code = 'business' and item_id = #{id}")
+    @Select("select a.*,u.`name` userName from action_log a left join `user` u on a.user_id = u.id where code = 'business' and item_id = #{id} order by creat_time desc")
     List<ActionLog> selectByInfoListBusiness(Integer id);
     @Select("select a.*,u.`name` userName from action_log a left join `user` u on a.user_id = u.id where code = 'custom' and item_id = #{id}")
     List<ActionLog> selectByInfoListCustom(Integer id);

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -283,6 +283,7 @@
         from business_opportunity
         where company_id = #{companyId}
         and is_delete = 0
+        order by create_time desc
     </select>
 
     <select id="getAllList1" resultType="com.management.platform.entity.BusinessOpportunity">
@@ -293,6 +294,7 @@
         and (incharger_id in
         (SELECT id from `user` WHERE department_id = (SELECT department_id from `user` WHERe id = #{id}))
         or incharger_id is null)
+        order by create_time desc
     </select>
 
     <select id="getAllList2" resultType="com.management.platform.entity.BusinessOpportunity">
@@ -301,5 +303,6 @@
         where company_id = #{companyId}
           and is_delete = 0
           and (incharger_id = #{id} or incharger_id is null)
+        order by create_time desc
     </select>
 </mapper>