用户修改

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

@@ -182,7 +182,6 @@ public class UserController {
 	@PreAuthorize("@el.check('user:add')")
 	public AppBaseResponse createUser(@Validated @RequestBody UserEditReqVO userEditReqVO) {
 		User userEntity = BeanCopyUtils.convertObj(userEditReqVO, User.class);
-		System.out.println("===" + userEntity);
 		checkLevel(userEntity);
 		// 默认密码 123456
 		userEntity.setPassword(passwordEncoder.encode("123456"));
@@ -193,12 +192,11 @@ public class UserController {
 	@ApiOperation("修改用户")
 	@PutMapping
 	@PreAuthorize("@el.check('user:edit')")
-	public ResponseEntity<Object> updateUser(@Validated(User.Update.class) @RequestBody UserEditReqVO userEditReqVO)
+	public AppBaseResponse updateUser(@Validated(User.Update.class) @RequestBody UserEditReqVO userEditReqVO)
 			throws Exception {
 		User userEntity = BeanCopyUtils.convertObj(userEditReqVO, User.class);
 		checkLevel(userEntity);
-		userService.update(userEntity);
-		return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+		return userService.update(userEntity);
 	}
 
 	@Log("修改用户：个人中心")

eladmin-system/src/main/java/me/zhengjie/application/admin/service/UserService.java

@@ -51,7 +51,7 @@ public interface UserService {
      * @param resources /
      * @throws Exception /
      */
-    void update(User resources) throws Exception;
+    AppBaseResponse update(User resources) throws Exception;
 
     /**
      * 删除用户

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);
             return response;
         }
-        if (userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo()) > 0) {
+        if (userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo()) != null) {
             response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
             return response;
         }
@@ -362,9 +362,16 @@ public class UserServiceImpl implements UserService {
     }
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(User resources) throws Exception {
+    public AppBaseResponse update(User resources) throws Exception {
+        AppBaseResponse response = new AppBaseResponse();
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
+        Integer id = userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo());
+        if (id != null && !id.equals(resources.getId())) {
+            response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
+            return response;
+        }
         ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
+
         User user1 = userRepository.findByUsername(resources.getUsername());
         User user2 = userRepository.findByPhone(resources.getPhone());
         if (user1 != null && !user.getId().equals(user1.getId())) {
@@ -415,6 +422,7 @@ public class UserServiceImpl implements UserService {
         userRepository.save(user);
         // 清除缓存
         delCaches(user.getId(), user.getUsername());
+        return response;
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/FaceCompareRepository.java

@@ -46,7 +46,7 @@ public class FaceCompareRepository {
             faceCompareRsp.setUrl(previewUrl);
             if (!TextUtils.isEmpty(faceCompareRsp.getConsultNo())) {
                 QueryWrapper<ContractOrderEntity> orderQw = new QueryWrapper<>();
-                orderQw.like("consult_no", faceCompareRsp.getConsultNo());
+                orderQw.like("business_no", faceCompareRsp.getBusinessNo());
                 ContractOrderEntity entity = contractOrderMapper.selectOne(orderQw);
                 if (null != entity) {
                     faceCompareRsp.setOrderStatus(entity.getStatus());

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

@@ -57,8 +57,8 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
      * @param jobNo 工号
      * @return /
      */
-    @Query(value = "SELECT count(1) FROM sys_user WHERE dept_id = ?1 AND job_no = ?2", nativeQuery = true)
-    int findByDeptIdAndJobNo(String deptId, String jobNo);
+    @Query(value = "SELECT user_id FROM sys_user WHERE dept_id = ?1 AND job_no = ?2", nativeQuery = true)
+    Integer findByDeptIdAndJobNo(String deptId, String jobNo);
 
     /**
      * 修改密码