✨ Introducing new features. 增加用户新增和编辑时候的手机号重复判断

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ErrorCodes.java

@@ -23,6 +23,12 @@ public interface ErrorCodes {
 	 */
 	String SYS_USER_USERNAME_EXISTING = "sys.user.username.existing";
 
+
+	/**
+	 * 用户已存在
+	 */
+	String SYS_USER_PHONE_EXISTING = "sys.user.phone.existing";
+
 	/**
 	 * 用户原密码错误，修改失败
 	 */

pigx-common/pigx-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -2,6 +2,7 @@ sys.user.update.passwordError=\u539F\u5BC6\u7801\u9519\u8BEF\uFF0C\u4FEE\u6539\u
 sys.user.query.error=\u83B7\u53D6\u5F53\u524D\u7528\u6237\u4FE1\u606F\u5931\u8D25
 sys.user.import.succeed=\u7528\u6237\u5BFC\u5165\u6210\u529F\uFF0C\u9ED8\u8BA4\u5BC6\u7801\u4E3A\u624B\u673A\u53F7
 sys.user.username.existing={0} \u7528\u6237\u540D\u5DF2\u5B58\u5728
+sys.user.phone.existing={0} \u624b\u673a\u53f7\u5df2\u5b58\u5728
 sys.user.userInfo.empty={0} \u7528\u6237\u4FE1\u606F\u4E3A\u7A7A
 sys.dept.deptName.inexistence={0} \u90E8\u95E8\u540D\u79F0\u4E0D\u5B58\u5728
 sys.post.postName.inexistence={0} \u5C97\u4F4D\u540D\u79F0\u4E0D\u5B58\u5728

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java

@@ -107,6 +107,18 @@ public class SysUserController {
 		return R.ok(userService.getOne(new QueryWrapper<>(condition)));
 	}
 
+	/**
+	 * 根据手机号查询用户信息
+	 * @param phone 用户名
+	 * @return
+	 */
+	@GetMapping("/detailsByPhone/{phone}")
+	public R detailsByPhone(@PathVariable String phone) {
+		SysUser condition = new SysUser();
+		condition.setPhone(phone);
+		return R.ok(userService.getOne(new QueryWrapper<>(condition)));
+	}
+
 	/**
 	 * 删除用户信息
 	 * @param id ID
@@ -143,7 +155,7 @@ public class SysUserController {
 	@PutMapping
 	@PreAuthorize("@pms.hasPermission('sys_user_edit')")
 	public R updateUser(@Valid @RequestBody UserDTO userDto) {
-		return R.ok(userService.updateUser(userDto));
+		return userService.updateUser(userDto);
 	}
 
 	/**

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java

@@ -72,7 +72,7 @@ public interface SysUserService extends IService<SysUser> {
 	 * @param userDto 用户信息
 	 * @return
 	 */
-	Boolean updateUser(UserDTO userDto);
+	R<Boolean> updateUser(UserDTO userDto);
 
 	/**
 	 * 通过ID查询用户信息

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java

@@ -206,8 +206,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#userDto.username")
-	public Boolean updateUser(UserDTO userDto) {
+	public R<Boolean> updateUser(UserDTO userDto) {
 		SysUser sysUser = new SysUser();
+
+
+		boolean exists = baseMapper.exists(Wrappers.<SysUser>lambdaQuery()
+				.eq(SysUser::getPhone, userDto.getPhone())
+				.ne(SysUser::getUserId, userDto.getUserId())
+		);
+		if(exists){
+			return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING,userDto.getPhone()));
+		}
+
 		BeanUtils.copyProperties(userDto, sysUser);
 		sysUser.setUpdateTime(LocalDateTime.now());
 
@@ -231,7 +241,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			userPost.setPostId(postId);
 			userPost.insert();
 		});
-		return Boolean.TRUE;
+		return R.ok();
 	}
 
 	/**