Commit a6666573 by 徐高华

通讯录

parent df7ff86f
......@@ -198,7 +198,7 @@ public class StaffApiServiceImpl implements StaffApiService {
res.setCode(2);
return res;
}
String corpid = qwDTO.getDkCorpid() ;
String dkCorpid = qwDTO.getDkCorpid() ;
SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
logger.info("没有配置secret:{}", JSONObject.toJSONString(qwDTO));
......@@ -208,16 +208,16 @@ public class StaffApiServiceImpl implements StaffApiService {
}
UserDTO user = null;
if(qwDTO.getWxSecurityType()==4) {
user = qywxUserApiService.getWorkWxUser(corpid, config.getWxSuiteid(), wxUserId);
user = qywxUserApiService.getWorkWxUser(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
logger.info("成员详情(第三方)={}",JSON.toJSONString(user)) ;
UserDTO userSelf = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), user.getOpen_userid());
UserDTO userSelf = qywxUserApiService.getSelfWorkWxUser(dkCorpid, secretSetting.getSecretVal(), user.getOpen_userid());
logger.info("成员详情(代开)={}",JSON.toJSONString(user)) ;
if (user != null && userSelf != null) {
user.setName(userSelf.getName());
user.setPosition(userSelf.getPosition());
}
} else {
user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), wxUserId);
user = qywxUserApiService.getSelfWorkWxUser(dkCorpid, secretSetting.getSecretVal(), wxUserId);
logger.info("成员详情(代开)={}",JSON.toJSONString(user)) ;
}
if (null == user) {
......@@ -235,7 +235,7 @@ public class StaffApiServiceImpl implements StaffApiService {
nationCode = arr[0];
phoneNumber = arr[1];
}
String openUserid = getOpenUserid(wxUserId, corpid , qwDTO);
String openUserid = getOpenUserid(wxUserId, dkCorpid , qwDTO);
TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, openUserid, wxEnterpriseId);
if (staff != null) {
staffService.delOtherStaffByWxUserId(staff.getWxUserId(), staff.getStaffId(), wxEnterpriseId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment