0605

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -239,10 +239,9 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public String checkPhoneUnique(SysUser user) {
-        String tenantId = request.getHeader("tenantId");
         long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhoneNumber());
-        if (StringUtils.isNotNull(info) && info.getUserId() != userId && info.getTenantId().equals(Long.parseLong(tenantId))) {
+        if (StringUtils.isNotNull(info) && info.getUserId() != userId && info.getUsageCompanyId().equals(user.getUsageCompanyId())) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -256,10 +255,9 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public String checkEmailUnique(SysUser user) {
-        String tenantId = request.getHeader("tenantId");
         long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId() != userId  && info.getTenantId().equals(Long.parseLong(tenantId))) {
+        if (StringUtils.isNotNull(info) && info.getUserId() != userId  && info.getUsageCompanyId().equals(user.getUsageCompanyId())) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;