Merge branch 'master' into dev

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

@@ -458,13 +458,19 @@ public class OrgSyncByWxcpJob {
             if (!StringUtils.equals(userInfo.getUiNickname(), wxCpUser.getName()) ||
                     !userInfo.getUiUsername().equals(wxCpUser.getName()) || StrUtil.isBlankIfStr(userInfo.getUiHeadimgMp())
                     || !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())) {
+                if (StringUtils.equals(userInfo.getUiHeadimg(), wxCpUser.getThumbAvatar())) {
+                    log.info("用户头像未变化，无须重新生成qrcode，{}", JsonUtil.toJson(userInfo));
+                } else {
+                    userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), wxCpUser.getThumbAvatar(), qrCodeUrl));
+                }
                 userInfo.setUiNickname(wxCpUser.getName());
                 userInfo.setUiUsername(wxCpUser.getName());
                 userInfo.setUiHeadimgMp(wxCpUser.getThumbAvatar());
+                userInfo.setUiHeadimg(wxCpUser.getThumbAvatar());
                 userInfo.setWxcpUid(wxCpUser.getUserId());
                 userInfo.setUiShenfen(String.valueOf(wxCpUser.getIsLeader()));
-                userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), wxCpUser.getThumbAvatar(), qrCodeUrl));
                 updateList.add(userInfo);
             }
             hashMap.remove(id);