|
@@ -19,6 +19,7 @@
|
|
|
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
|
import com.alibaba.nacos.common.utils.Md5Utils;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -291,6 +292,10 @@ public class SysUserController {
|
|
|
@PostMapping
|
|
|
@PreAuthorize("@pms.hasPermission('sys_user_add')")
|
|
|
public R user(@RequestBody UserDTO userDto) {
|
|
|
+
|
|
|
+ // 姓名去除空格(包括字符之间的所有空格都会去除)
|
|
|
+ userDto.setRealname(StrUtil.cleanBlank(userDto.getRealname()));
|
|
|
+
|
|
|
// if (SecurityUtils.getRoles().contains(2) ||
|
|
|
// SecurityUtils.getRoles().contains(1)) {
|
|
|
SysDept sysDept = sysDeptService.getById(userDto.getDeptId());
|
|
@@ -1368,8 +1373,10 @@ public class SysUserController {
|
|
|
*/
|
|
|
SysDept sysDept = sysDeptService.getById(userDto.getDeptId());
|
|
|
|
|
|
-
|
|
|
if (null != userDto.getUserId()) {
|
|
|
+ // 姓名去除空格(包括字符之间的所有空格都会去除)
|
|
|
+ userDto.setRealname(StrUtil.cleanBlank(userDto.getRealname()));
|
|
|
+
|
|
|
SysUser oldData = userService.getById(userDto.getUserId());
|
|
|
if (!userDto.getRealname().equals(oldData.getRealname())) {
|
|
|
if (userDto.getRole().contains(6) || userDto.getRole().contains(10)) {
|