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

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

@@ -114,7 +114,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
     @Override
     @ApiOperation(value = "修改", notes = "修改")
     @Transactional(rollbackFor = Exception.class)
-    public R<Boolean> update(UpdateDto updateDto) {
+    public R<String> update(UpdateDto updateDto) {
         String account = updateDto.getAccount();
         log.info("权限用户信息修改：{}", JSONUtil.toJsonPrettyStr(updateDto));
         // 校验
@@ -126,7 +126,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("登录名已存在");
+                    return R.ok("登录名已存在");
                 }
             }
         }
@@ -134,7 +134,8 @@ 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("手机号已存在");
+                    return R.ok("手机号已存在");
+
                 }
             }
         }
@@ -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("邮箱已存在");
+                    return R.ok("邮箱已存在");
                 }
             }
         }
@@ -188,7 +189,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
                 log.info("{},清理部门", sysWorkUser.getAccount());
             }
         }
-        return R.ok(Boolean.TRUE);
+        return R.ok();
     }
 
     @Override

authorize-api/src/main/java/com/xy/service/SysWorkUserService.java

@@ -26,8 +26,7 @@ public interface SysWorkUserService {
 
 
     @PostMapping("update")
-    R<Boolean> update(@Valid @RequestBody UpdateDto updateDto);
-
+    R<String> update(@Valid @RequestBody UpdateDto updateDto);
 
     @PostMapping("del")
     R del(@RequestBody @Validated DelDto delDto);