From effd939522b5226089b9f529f29206278704110e Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Tue, 24 Dec 2024 15:05:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=A8=E6=88=B7=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E4=BD=9C=E4=B8=BA=E4=B8=80=E6=A0=A1=E9=AA=8C=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5=E9=83=BD=E5=A2=9E=E5=8A=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 8 +++++++ .../mapper/wm/WmStorageLocationMapper.xml | 2 +- .../com/ktg/system/mapper/SysUserMapper.java | 2 ++ .../ktg/system/service/ISysUserService.java | 7 ++++++ .../service/impl/SysUserServiceImpl.java | 22 +++++++++++++++++++ .../resources/mapper/system/SysUserMapper.xml | 5 ++++- 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java b/ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java index 20799c1..d7f92d3 100644 --- a/ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java +++ b/ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java @@ -123,6 +123,10 @@ public class SysUserController extends BaseController { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } + else if (StringUtils.isNotEmpty(user.getNickName()) + && UserConstants.NOT_UNIQUE.equals(userService.checkNickNameUnique(user))) { + return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，昵称已存在"); + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { @@ -153,6 +157,10 @@ public class SysUserController extends BaseController { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); } + else if (StringUtils.isNotEmpty(user.getNickName()) + && UserConstants.NOT_UNIQUE.equals(userService.checkNickNameUnique(user))) { + return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，昵称已存在"); + } else if (StringUtils.isNotEmpty(user.getEmail()) && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml index c06c5e7..cdc5699 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where location_name = #{locationName} and warehouse_id = #{warehouseId} limit 1 - where location_id in diff --git a/ktg-system/src/main/java/com/ktg/system/mapper/SysUserMapper.java b/ktg-system/src/main/java/com/ktg/system/mapper/SysUserMapper.java index aa973cc..4df0677 100644 --- a/ktg-system/src/main/java/com/ktg/system/mapper/SysUserMapper.java +++ b/ktg-system/src/main/java/com/ktg/system/mapper/SysUserMapper.java @@ -131,4 +131,6 @@ public interface SysUserMapper * @return 结果 */ public SysUser checkEmailUnique(String email); + + int checkUserNickNameUnique(SysUser user); } diff --git a/ktg-system/src/main/java/com/ktg/system/service/ISysUserService.java b/ktg-system/src/main/java/com/ktg/system/service/ISysUserService.java index 3db7c5b..4918d80 100644 --- a/ktg-system/src/main/java/com/ktg/system/service/ISysUserService.java +++ b/ktg-system/src/main/java/com/ktg/system/service/ISysUserService.java @@ -210,4 +210,11 @@ public interface ISysUserService * @return 结果 */ public String importUser(List userList, Boolean isUpdateSupport, String operName); + + /** + * 校验昵称是否存在 + * @param user + * @return + */ + String checkNickNameUnique(SysUser user); } diff --git a/ktg-system/src/main/java/com/ktg/system/service/impl/SysUserServiceImpl.java b/ktg-system/src/main/java/com/ktg/system/service/impl/SysUserServiceImpl.java index a776698..6960095 100644 --- a/ktg-system/src/main/java/com/ktg/system/service/impl/SysUserServiceImpl.java +++ b/ktg-system/src/main/java/com/ktg/system/service/impl/SysUserServiceImpl.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; + +import cn.hutool.core.util.ObjectUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -521,6 +523,16 @@ public class SysUserServiceImpl implements ISysUserService { try { + if (ObjectUtil.isEmpty(user.getNickName())) { + failureNum++; + failureMsg.append("
" + "必填项未填写"); + continue; + } + if (UserConstants.NOT_UNIQUE.equals(checkNickNameUnique(user))) { + failureNum++; + failureMsg.append("
" + "昵称重复"); + continue; + } // 验证是否存在这个用户 SysUser u = userMapper.selectUserByUserName(user.getUserName()); if (StringUtils.isNull(u)) @@ -567,4 +579,14 @@ public class SysUserServiceImpl implements ISysUserService } return successMsg.toString(); } + + @Override + public String checkNickNameUnique(SysUser user) { + int count = userMapper.checkUserNickNameUnique(user); + if (count > 0) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml b/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml index e1538a9..4b010ae 100644 --- a/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -145,7 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into sys_user( user_id,