|
|
@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
|
|
3
|
3
|
import java.util.ArrayList;
|
|
4
|
4
|
import java.util.List;
|
|
5
|
5
|
import java.util.stream.Collectors;
|
|
|
6
|
+import javax.validation.Validator;
|
|
6
|
7
|
import org.slf4j.Logger;
|
|
7
|
8
|
import org.slf4j.LoggerFactory;
|
|
8
|
9
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.constant.UserConstants;
|
|
13
|
14
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
14
|
15
|
import com.ruoyi.common.core.utils.SpringUtils;
|
|
15
|
16
|
import com.ruoyi.common.core.utils.StringUtils;
|
|
|
17
|
+import com.ruoyi.common.core.utils.bean.BeanValidators;
|
|
16
|
18
|
import com.ruoyi.common.datascope.annotation.DataScope;
|
|
17
|
19
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
18
|
20
|
import com.ruoyi.system.api.domain.SysRole;
|
|
|
@@ -56,6 +58,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
56
|
58
|
@Autowired
|
|
57
|
59
|
private ISysConfigService configService;
|
|
58
|
60
|
|
|
|
61
|
+ @Autowired
|
|
|
62
|
+ protected Validator validator;
|
|
|
63
|
+
|
|
59
|
64
|
/**
|
|
60
|
65
|
* 根据条件分页查询用户列表
|
|
61
|
66
|
*
|
|
|
@@ -513,6 +518,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
513
|
518
|
SysUser u = userMapper.selectUserByUserName(user.getUserName());
|
|
514
|
519
|
if (StringUtils.isNull(u))
|
|
515
|
520
|
{
|
|
|
521
|
+ BeanValidators.validateWithException(validator, user);
|
|
516
|
522
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
|
517
|
523
|
user.setCreateBy(operName);
|
|
518
|
524
|
this.insertUser(user);
|
|
|
@@ -521,6 +527,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
521
|
527
|
}
|
|
522
|
528
|
else if (isUpdateSupport)
|
|
523
|
529
|
{
|
|
|
530
|
+ BeanValidators.validateWithException(validator, user);
|
|
524
|
531
|
user.setUpdateBy(operName);
|
|
525
|
532
|
this.updateUser(user);
|
|
526
|
533
|
successNum++;
|