1.清理wxopenId

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantStaffServiceImpl.java

@@ -112,10 +112,7 @@ public class TenantStaffServiceImpl extends ServiceImpl<TenantStaffMapper, Tenan
             // 更换了机构，清理wx关联ID
             if (!staff.getTenantId().equals(tenantStaff.getTenantId())) {
                 staff.setTenantId(tenantStaff.getTenantId());
-                this.lambdaUpdate()
-                        .set(TenantStaff::getWxOpenid, null)
-                        .eq(TenantStaff::getId, staff.getId())
-                        .update();
+                staff.setWxOpenid(null);
             }
         }
         Long userId = staff.getUserId();
@@ -139,11 +136,8 @@ public class TenantStaffServiceImpl extends ServiceImpl<TenantStaffMapper, Tenan
             if (StringUtils.isNotEmpty(wxOpenid)) {
                 // 旧手机号退出登录
                 sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
-                        sysUser.getPhone(), wxOpenid);
-                this.lambdaUpdate()
-                        .set(TenantStaff::getWxOpenid, null)
-                        .eq(TenantStaff::getId, staff.getId())
-                        .update();
+                        oldUser.getPhone(), wxOpenid);
+                staff.setWxOpenid(null);
             }
         }
         sysUserMapper.updateById(sysUser);
@@ -153,7 +147,13 @@ public class TenantStaffServiceImpl extends ServiceImpl<TenantStaffMapper, Tenan
                 .set(TenantInfo::getUsername, tenantStaff.getNickname())
                 .eq(TenantInfo::getUserId, staff.getUserId()));
 
-        return this.updateById(staff);
+       return this.lambdaUpdate()
+                .set(TenantStaff::getWxOpenid, staff.getWxOpenid())
+                .set(TenantStaff::getTenantId, staff.getTenantId())
+                .set(TenantStaff::getManageAdmin, staff.getManageAdmin())
+                .set(TenantStaff::getNickname, staff.getNickname())
+                .eq(TenantStaff::getId, staff.getId())
+                .update();
     }
 
     @Override