Merge branch 'feature-2024-09-23' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -608,10 +608,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     }
 
     private TabHaobanPreDealLog getRootDept(String wxEnterpriseId,String rootPid,String taskId) {
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        WxEnterpriseDTO wxEnterpriseDTO = this.wxEnterpriseService.selectById(wxEnterpriseId);
         com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO = new com.gic.wechat.api.dto.qywx.DepartmentDTO();
 
-        departmentDTO.setName(qwDTO.getAgentName());
+        departmentDTO.setName(wxEnterpriseDTO.getName());
         departmentDTO.setParentid(0);
         departmentDTO.setOrder(0L);
         departmentDTO.setId(Integer.valueOf(rootPid));