Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.xy.collections.map.JMap;
 import com.xy.dto.SysWorkUser.*;
 import com.xy.entity.*;
 import com.xy.enums.LogEnum;
+import com.xy.error.CommRuntimeException;
 import com.xy.mapper.*;
 import com.xy.redis.RedisCache;
 import com.xy.service.CaptchaService;
@@ -126,7 +127,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
             if (!account.equals(byId.getAccount())) {
                 long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getAccount, account));
                 if (count > 0) {
-                    return R.fail("登录名已存在");
+                    throw new CommRuntimeException("登录名已存在");
                 }
             }
         }
@@ -134,7 +135,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
             if (!updateDto.getPhone().equals(byId.getPhone())) {
                 long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getPhone, updateDto.getPhone()));
                 if (count > 0) {
-                    return R.fail("手机号已存在");
+                    throw new CommRuntimeException("手机号已存在");
                 }
             }
         }
@@ -142,7 +143,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
             if (!updateDto.getEmail().equals(byId.getEmail())) {
                 long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getEmail, updateDto.getEmail()));
                 if (count > 0) {
-                    return R.fail("邮箱已存在");
+                    throw new CommRuntimeException("邮箱已存在");
                 }
             }
         }