Skip to content

F
feo-jobs
Commit 69df3f80 authored by 钱坤's avatar 钱坤
Browse files
Options

从企微同步时候，修正球码生成的条件判断逻辑。

parent 3fd42f90
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java
View file @ 69df3f80
...@@ -460,8 +460,10 @@ public class OrgSyncByWxcpJob { ...@@ -460,8 +460,10 @@ public class OrgSyncByWxcpJob {
|| !wxCpUser.getUserId().equals(userInfo.getWxcpUid()) || StrUtil.isBlankIfStr(userInfo.getUiWechatXcxQrcode()) || !wxCpUser.getUserId().equals(userInfo.getWxcpUid()) || StrUtil.isBlankIfStr(userInfo.getUiWechatXcxQrcode())
|| !userInfo.getUiShenfen().equals(String.valueOf(wxCpUser.getIsLeader())) || !userInfo.getUiShenfen().equals(String.valueOf(wxCpUser.getIsLeader()))
|| !StringUtils.equals(userInfo.getUiHeadimg(), wxCpUser.getThumbAvatar())) { || !StringUtils.equals(userInfo.getUiHeadimg(), wxCpUser.getThumbAvatar())) {
if (StringUtils.equals(userInfo.getUiHeadimg(), wxCpUser.getThumbAvatar())) { if ((StringUtils.equals(userInfo.getUiHeadimg(), wxCpUser.getThumbAvatar())
log.info("用户头像未变化，无须重新生成qrcode，{}", JsonUtil.toJson(userInfo)); || StringUtils.isBlank(userInfo.getUiHeadimg()) && StringUtils.isBlank(wxCpUser.getThumbAvatar()))
&& StringUtils.isNotBlank(userInfo.getUiWechatXcxQrcode())) {
log.info("用户头像未变化，无须重新生成qrcode，{}, {}", JsonUtil.toJson(userInfo), JsonUtil.toJson(wxCpUser));
} else { } else {
userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), wxCpUser.getThumbAvatar(), qrCodeUrl)); userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), wxCpUser.getThumbAvatar(), qrCodeUrl));
} }
......
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