Merge branch 'feature/1219-tenant' into develop-new

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

@@ -186,9 +186,19 @@ public class TenantStaffServiceImpl extends ServiceImpl<TenantStaffMapper, Tenan
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void clearWxOpenId(Long id) {
-        this.lambdaUpdate()
-                .set(TenantStaff::getWxOpenid, null)
-                .eq(TenantStaff::getId, id)
-                .update();
+        TenantStaff staff = this.getById(id);
+        if (staff == null) {
+            return;
+        }
+        String wxOpenid = staff.getWxOpenid();
+        if (StringUtils.isNotEmpty(wxOpenid)) {
+            SysUser sysUser = sysUserMapper.getByUserId(staff.getUserId());
+            sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
+                    sysUser.getPhone(), wxOpenid);
+            this.lambdaUpdate()
+                    .set(TenantStaff::getWxOpenid, null)
+                    .eq(TenantStaff::getId, id)
+                    .update();
+        }
     }
 }