Merge branch 'feature-0323' into developer

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

@@ -83,6 +83,8 @@ public class MessageApiServiceImpl implements MessageApiService {
     private SecretSettingService secretSettingService;
     @Autowired
     private DepartmentApiService departmentApiService;
+    @Autowired
+    private WxApplicationApiService wxApplicationApiService;
 
     @Override
     public void gicMessageReceive(GicMessageDTO gicMessageDTO) {
@@ -277,15 +279,38 @@ public class MessageApiServiceImpl implements MessageApiService {
      */
     private void dealDepartment(QywxCallBackDTO qywxCallBackDTO) {
         log.info("处理部门：{}", qywxCallBackDTO);
+        Integer wxDeptId = qywxCallBackDTO.getId();
+        String authCorpId = qywxCallBackDTO.getAuthCorpId();
         DepartmentDTO departmentDTO = new DepartmentDTO();
-        departmentDTO.setDepartmentName(qywxCallBackDTO.getDepartmentName());
         departmentDTO.setIsStore(0);
-        TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
+        TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(authCorpId);
+        if (enterprise == null) {
+            log.info("为查询到企业：authCorpId:{}", authCorpId);
+            return;
+        }
+        String wxEnterpriseId = enterprise.getWxEnterpriseId();
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+        if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
+            log.info("没有配置secret：{}", wxEnterpriseId);
+            return;
+        }
+        String corpid = "";
+        String secret = secretSetting.getSecretVal();
+        if (authCorpId.length() > 20) {
+            WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 3);
+            if (application != null) {
+                corpid = application.getCorpid();
+            }
+        } else {
+            corpid = authCorpId;
+        }
+        com.gic.wechat.api.dto.qywx.DepartmentDTO deptDetail = qywxDepartmentApiService.getSelfDepartmentById(corpid, secret, wxDeptId);
+        departmentDTO.setDepartmentName(deptDetail.getName());
         TabHaobanDepartment parentDepartment = new TabHaobanDepartment();
         if (qywxCallBackDTO.getParentId() != null) {
-            parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", enterprise.getWxEnterpriseId());
+            parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", wxEnterpriseId);
         } else {
-            TabHaobanDepartment oldDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
+            TabHaobanDepartment oldDepartment = this.departmentService.getByWxId(wxDeptId + "", wxEnterpriseId);
             if (oldDepartment != null) {
                 parentDepartment = departmentService.selectById(oldDepartment.getParentDepartmentId());
             }
@@ -293,7 +318,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         String changeType = qywxCallBackDTO.getChangeType();
         if (!changeType.equals(WxEditType.DELETE_DEPART.getCode())) {
             if (parentDepartment == null) {
-                log.info("微信同步父部门不存在");
+                log.info("企微同步父部门不存在");
                 return;
             }
             departmentDTO.setParentDepartmentId(parentDepartment.getDepartmentId());
@@ -301,16 +326,16 @@ public class MessageApiServiceImpl implements MessageApiService {
             departmentDTO.setChainName(parentDepartment.getChainName() + Constant.NAME_SEPARATOR + parentDepartment.getChainName());
             departmentDTO.setLevel(parentDepartment.getLevel() + 1);
         }
-        departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
-        departmentDTO.setWxDepartmentId(qywxCallBackDTO.getId() + "");
+        departmentDTO.setWxEnterpriseId(wxEnterpriseId);
+        departmentDTO.setWxDepartmentId(wxDeptId + "");
         if (qywxCallBackDTO.getParentId() != null) {
-            List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listDepartment(qywxCallBackDTO.getAuthCorpId(), qywxCallBackDTO.getSuiteId(), qywxCallBackDTO.getParentId());
+            List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listSelfDepartment(corpid, secret, qywxCallBackDTO.getParentId());
             if (list != null) {
                 for (com.gic.wechat.api.dto.qywx.DepartmentDTO wxDepartmentDTO : list) {
                     if (Convert.toStr(wxDepartmentDTO.getId()).equals(departmentDTO.getDepartmentId())) {
                         departmentDTO.setSort(qywxCallBackDTO.getOrder());
                     } else {
-                        TabHaobanDepartment tab = this.departmentService.getByWxId(wxDepartmentDTO.getId() + "", enterprise.getWxEnterpriseId());
+                        TabHaobanDepartment tab = this.departmentService.getByWxId(wxDepartmentDTO.getId() + "", wxEnterpriseId);
                         if (tab != null) {
                             tab.setSort(wxDepartmentDTO.getOrder());
                             this.departmentService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab));
@@ -324,7 +349,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             this.departmentService.add(departmentDTO);
         } else if (changeType.equals(WxEditType.UPDATE_DEPART.getCode())) {
             log.info("企微修改部门同步");
-            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
+            TabHaobanDepartment department = this.departmentService.getByWxId(wxDeptId + "", wxEnterpriseId);
             if (department == null) {
                 String response = this.departmentService.add(departmentDTO);
                 log.info("企微同步新增部门：{}", JSON.toJSONString(response));
@@ -336,7 +361,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             }
         } else if (changeType.equals(WxEditType.DELETE_DEPART.getCode())) {
             log.info("企微删除部门同步");
-            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
+            TabHaobanDepartment department = this.departmentService.getByWxId(wxDeptId + "", wxEnterpriseId);
             if (department == null) {
                 log.info("企微同步删除部门不存在");
             } else {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -138,7 +138,7 @@ public class StaffController extends WebBaseController {
         // 部门
         List<DepartmentDTO> sonDepartmentList = departmentApiService.listSonByDepartmentIds(Lists.newArrayList(departmentId), login.getWxEnterpriseId());
         List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
-        // 员工
+        //员工
         Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());