|
@@ -18,7 +18,6 @@ import com.xy.collections.map.JMap;
|
|
import com.xy.dto.SysWorkUser.*;
|
|
import com.xy.dto.SysWorkUser.*;
|
|
import com.xy.entity.*;
|
|
import com.xy.entity.*;
|
|
import com.xy.enums.LogEnum;
|
|
import com.xy.enums.LogEnum;
|
|
-import com.xy.error.CommRuntimeException;
|
|
|
|
import com.xy.mapper.*;
|
|
import com.xy.mapper.*;
|
|
import com.xy.redis.RedisCache;
|
|
import com.xy.redis.RedisCache;
|
|
import com.xy.service.CaptchaService;
|
|
import com.xy.service.CaptchaService;
|
|
@@ -112,10 +111,11 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
return R.ok(sysWorkUser.getId());
|
|
return R.ok(sysWorkUser.getId());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
@ApiOperation(value = "修改", notes = "修改")
|
|
@ApiOperation(value = "修改", notes = "修改")
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
- public R<Boolean> update(UpdateDto updateDto) {
|
|
|
|
|
|
+ public R<String> update(UpdateDto updateDto) {
|
|
String account = updateDto.getAccount();
|
|
String account = updateDto.getAccount();
|
|
log.info("权限用户信息修改:{}", JSONUtil.toJsonPrettyStr(updateDto));
|
|
log.info("权限用户信息修改:{}", JSONUtil.toJsonPrettyStr(updateDto));
|
|
// 校验
|
|
// 校验
|
|
@@ -127,7 +127,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
if (!account.equals(byId.getAccount())) {
|
|
if (!account.equals(byId.getAccount())) {
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getAccount, account));
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getAccount, account));
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
- throw new CommRuntimeException("登录名已存在");
|
|
|
|
|
|
+ return R.ok("登录名已存在");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -135,7 +135,8 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
if (!updateDto.getPhone().equals(byId.getPhone())) {
|
|
if (!updateDto.getPhone().equals(byId.getPhone())) {
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getPhone, updateDto.getPhone()));
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getPhone, updateDto.getPhone()));
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
- throw new CommRuntimeException("手机号已存在");
|
|
|
|
|
|
+ return R.ok("手机号已存在");
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -143,7 +144,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
if (!updateDto.getEmail().equals(byId.getEmail())) {
|
|
if (!updateDto.getEmail().equals(byId.getEmail())) {
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getEmail, updateDto.getEmail()));
|
|
long count = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getEmail, updateDto.getEmail()));
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
- throw new CommRuntimeException("邮箱已存在");
|
|
|
|
|
|
+ return R.ok("邮箱已存在");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -189,7 +190,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
log.info("{},清理部门", sysWorkUser.getAccount());
|
|
log.info("{},清理部门", sysWorkUser.getAccount());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return R.ok(Boolean.TRUE);
|
|
|
|
|
|
+ return R.ok();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|