租户管理-管理员配置-管理员新增/修改调整

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -79,7 +79,7 @@ public class SysUserController extends BaseController
     @PostMapping
     public ApiResult<Void> add(@Validated @RequestBody SysUser user)
     {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),SecurityUtils.getTenantId())))
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/UserConfigController.java

@@ -41,7 +41,7 @@ public class UserConfigController extends BaseController {
     @Transactional
     @PostMapping("/addUserData")
     public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),user.getTenantId()))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
@@ -66,7 +66,9 @@ public class UserConfigController extends BaseController {
     @Transactional
     @PostMapping("/updateserData")
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        if (!"".equals(user.getPassword())&&null!=user.getPassword()){
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        }
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(new Date());
         return toAjax(userService.updateUserData(user));

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -114,7 +114,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
      * @param userName 用户名称
      * @return 结果
      */
-    public int checkUserNameUnique(String userName,Integer tenantId);
+    public int checkUserNameUnique( @Param("userName") String userName, @Param("tenantId") Integer tenantId);
 
     /**
      * 校验手机号码是否唯一

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -77,7 +77,7 @@ public interface ISysUserService extends CrudService<SysUser> {
      * @param userName 用户名称
      * @return 结果
      */
-    public String checkUserNameUnique(String userName);
+    public String checkUserNameUnique(String userName,Integer tenantId);
 
     /**
      * 校验手机号码是否唯一

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -160,8 +160,9 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      * @return 结果
      */
     @Override
-    public String checkUserNameUnique(String userName) {
-        int count = userMapper.checkUserNameUnique(userName,SecurityUtils.getTenantId());
+    public String checkUserNameUnique(String userName,Integer tenantId) {
+//        Integer a = SecurityUtils.getTenantId();
+        int count = userMapper.checkUserNameUnique(userName,tenantId);
         if (count > 0) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -462,7 +463,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         {
             throw new BusinessException("当前系统没有开启注册功能！");
         }
-        if (UserConstants.NOT_UNIQUE.equals(this.checkUserNameUnique(username)))
+        if (UserConstants.NOT_UNIQUE.equals(this.checkUserNameUnique(username,SecurityUtils.getTenantId())))
         {
             throw new BusinessException("保存用户'" + username + "'失败，注册账号已存在");
         }

service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.user_id = #{userId}
 	</select>
 	
-	<select id="checkUserNameUnique" parameterType="String" resultType="int">
+	<select id="checkUserNameUnique" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} and del_flag != '2'
 		 <if test="tenantId != null and tenantId != 0">
 			 and tenant_id = #{tenantId}