Merge branch 'feature/xgh/202503' into 'developer'

Feature/xgh/202503

See merge request !2704

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java

@@ -84,13 +84,13 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
             if (CollectionUtils.isEmpty(selfUserIdList)) {
                 dealFlag = false;
                 reason = "无外部联系人";
-                List<TabHaobanExternalClerkRelated> memberList = this.tabHaobanExternalClerkRelatedMapper.listByStaffId(staffId) ;
+                /*List<TabHaobanExternalClerkRelated> memberList = this.tabHaobanExternalClerkRelatedMapper.listByStaffId(staffId) ;
                 if(CollectionUtils.isNotEmpty(memberList)) {
                     this.externalClerkRelatedService.cleanStaffRelated(wxEnterpriseId, Arrays.asList(staffId));
                     for(TabHaobanExternalClerkRelated item : memberList) {
                         this.staffClerkRelationService.delMemberQywxFlag(item.getEnterpriseId(),Arrays.asList(item.getMemberId())) ;
                     }
-                }
+                }*/
                 return;
             }
             String wxUserId3th = staff.getWxUserId() ;

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaterialCategoryMapper.xml

@@ -131,7 +131,7 @@
     <include refid="Base_Column_List" />
     from tab_haoban_material_category
     where status_flag = 1
-    and wx_enterprise_id = #{wxEnterpriseId}
+    and wx_enterprise_id = #{wxEnterpriseId}  order by sort_num desc , create_time desc
   </select>
   
   <select id="listByParentCategory" resultMap="BaseResultMap" parameterType="java.lang.String" >