Merge branch 'fixbug_0720' into developer

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

@@ -131,8 +131,9 @@ public class MessageApiServiceImpl implements MessageApiService {
         QywxCallBackDTO dto = JSON.parseObject(param, QywxCallBackDTO.class);
         log.info("【成员部门同步回调处理】dto={}", JSON.toJSONString(param));
         String suiteId = dto.getSuiteId();
+        String authCorpId = dto.getAuthCorpId();
         String staffThirdWxEnterpriseId = config.getStaffThirdWxEnterpriseId();
-        if (staffThirdWxEnterpriseId.contains(suiteId)) {
+        if (staffThirdWxEnterpriseId.contains(authCorpId)) {
             //处理部门
             dealQywxThirdDepartment(dto);
             //处理成员

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

@@ -322,7 +322,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         UserDTO user = null;
         if (staffThirdWxEnterpriseId.contains(corpid)) {
             UserDTO userThird = qywxUserApiService.getWorkWxUser(corpid, config.getWxSuiteid(), userId);
-            user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), userThird.getOpen_userid());
+            user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), userThird.getUserid());
         } else {
             user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), userId);
         }