Merge branch 'master_xgh_bug_11月' into 'developer'

成员id处理

See merge request !413

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

@@ -614,9 +614,11 @@ public class StaffApiServiceImpl implements StaffApiService {
             logger.info("没有配置secret:{}", qwDTO.getWxEnterpriseId());
             return null;
         }
-        String wxUserId = relationDTO.getQwUserId();
+        String staffId = relationDTO.getStaffId() ;
+        TabHaobanStaff staff = this.staffMapper.selectByPrimaryKey(staffId) ;
+        String wxUserId = staff.getWxUserId() ;
         if (qwDTO.needOpenUserIdDk()) {
-            wxUserId = relationDTO.getOpenUserId();
+            wxUserId = staff.getWxOpenUseId() ;
         }
         UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
         if (user != null) {