Merge branch 'developer' into feature-04-26

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

@@ -294,7 +294,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         log.info("新增外部联系人,wxEnterpriseId:{}", wxEnterpriseId);
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
             log.error("新增外部联系人，缺少必须字段：wxUserId:{},wxEnterpriseId:{},name:{},createTime:{},externalUserId:{}",wxUserId,wxEnterpriseId,name,createTime,externalUserId);
-            checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId,null,  dto);
+            //checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId,null,  dto);
             return;
         }
         TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);

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

@@ -317,27 +317,18 @@ public class MessageApiServiceImpl implements MessageApiService {
         String authCorpId = qywxCallBackDTO.getAuthCorpId();
         DepartmentDTO departmentDTO = new DepartmentDTO();
         departmentDTO.setIsStore(0);
-        TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(authCorpId);
-        if (enterprise == null) {
-            log.info("为查询到企业：authCorpId:{}", authCorpId);
+        TabHaobanWxApplication wxApplication = wxApplicationService.selectByCorpId(authCorpId);
+        if (Objects.isNull(wxApplication)) {
+            log.info("授权企业不存在，{}", qywxCallBackDTO.getAuthCorpId());
             return;
         }
-        String wxEnterpriseId = enterprise.getWxEnterpriseId();
+        String wxEnterpriseId = wxApplication.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;
-        }
         TabHaobanDepartment parentDepartment = new TabHaobanDepartment();
         if (qywxCallBackDTO.getParentId() != null) {
             parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", wxEnterpriseId);
@@ -353,7 +344,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                 log.info("企微同步父部门不存在");
                 return;
             }
-            com.gic.wechat.api.dto.qywx.DepartmentDTO deptDetail = qywxDepartmentApiService.getSelfDepartmentById(corpid, secret, wxDeptId);
+            com.gic.wechat.api.dto.qywx.DepartmentDTO deptDetail = qywxDepartmentApiService.getSelfDepartmentById(authCorpId, secret, wxDeptId);
             departmentDTO.setDepartmentName(deptDetail.getName());
             departmentDTO.setParentDepartmentId(parentDepartment.getDepartmentId());
             departmentDTO.setChainId(parentDepartment.getChainId() + Constant.ID_SEPARATOR + parentDepartment.getDepartmentId());
@@ -363,7 +354,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         departmentDTO.setWxEnterpriseId(wxEnterpriseId);
         departmentDTO.setWxDepartmentId(wxDeptId + "");
         if (qywxCallBackDTO.getParentId() != null) {
-            List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listSelfDepartment(corpid, secret, qywxCallBackDTO.getParentId());
+            List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listSelfDepartment(authCorpId, secret, qywxCallBackDTO.getParentId());
             if (CollectionUtils.isNotEmpty(list)) {
                 for (com.gic.wechat.api.dto.qywx.DepartmentDTO wxDepartmentDTO : list) {
                     if (Convert.toStr(wxDepartmentDTO.getId()).equals(departmentDTO.getDepartmentId())) {