Browse Source

修复重复工号问题

gaoxinguang 2 years ago
parent
commit
f51945a61a

+ 1 - 0
eladmin-system/src/main/java/me/zhengjie/application/admin/controller/UserController.java

@@ -182,6 +182,7 @@ public class UserController {
 	@PreAuthorize("@el.check('user:add')")
 	@PreAuthorize("@el.check('user:add')")
 	public AppBaseResponse createUser(@Validated @RequestBody UserEditReqVO userEditReqVO) {
 	public AppBaseResponse createUser(@Validated @RequestBody UserEditReqVO userEditReqVO) {
 		User userEntity = BeanCopyUtils.convertObj(userEditReqVO, User.class);
 		User userEntity = BeanCopyUtils.convertObj(userEditReqVO, User.class);
+		System.out.println("===" + userEntity);
 		checkLevel(userEntity);
 		checkLevel(userEntity);
 		// 默认密码 123456
 		// 默认密码 123456
 		userEntity.setPassword(passwordEncoder.encode("123456"));
 		userEntity.setPassword(passwordEncoder.encode("123456"));

+ 1 - 1
eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/UserServiceImpl.java

@@ -267,7 +267,7 @@ public class UserServiceImpl implements UserService {
             response.fail(ResultCode.PHONE_HAS_EXISTED);
             response.fail(ResultCode.PHONE_HAS_EXISTED);
             return response;
             return response;
         }
         }
-        if (userRepository.findByDeptIdAndJobNo(resources.getDept().getName(), resources.getJobNo()) > 0) {
+        if (userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo()) > 0) {
             response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
             response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
             return response;
             return response;
         }
         }

+ 1 - 1
eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/UserRepository.java

@@ -53,7 +53,7 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
 
 
     /**
     /**
      * 根据部门id和工号查询
      * 根据部门id和工号查询
-     * @param deptId 手机号
+     * @param deptId 部门id
      * @param jobNo 工号
      * @param jobNo 工号
      * @return /
      * @return /
      */
      */