From 74283017e3762a3bd1d70348833280dd0ec64598 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Mon, 20 May 2024 13:47:33 +0800
Subject: [PATCH] update

---
 .../modules/data/service/StaffsService.kt     |  3 ---
 .../tsms/modules/user/req/UpdateUserReq.java  |  2 +-
 .../tsms/modules/user/web/UserController.java | 25 +++++++++++--------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
index 00075f3..b9532c9 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
@@ -107,7 +107,6 @@ open class StaffsService(
         val grade = if (req.gradeId != null && req.gradeId > 0L) gradeRepository.findById(req.gradeId).orElseThrow() else null
         val team = if (req.teamId != null && req.teamId > 0L) teamRepository.findById(req.teamId).orElseThrow() else null
         val salary = salaryRepository.findBySalaryPoint(req.salaryId).orElseThrow()
-//        val salaryEffective = salaryEffectiveRepository.findById(req.salaryEffId).orElseThrow()
         val department = departmentRepository.findById(req.departmentId).orElseThrow()
 
         val user = userRepository.saveAndFlush(
@@ -116,7 +115,6 @@ open class StaffsService(
                 password = passwordEncoder.encode("mms1234")
                 name = req.name
                 phone1 = req.phone1
-//                phone2 = req.phone2 ?: null
                 email = req.email ?: null
             }
         )
@@ -141,7 +139,6 @@ open class StaffsService(
             this.company = company
             this.grade = grade
             this.team = team
-//            this.skill = skill
             this.salary = salary
             this.department = department
         }
diff --git a/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java b/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java
index 87838be..853f04b 100644
--- a/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java
+++ b/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java
@@ -24,7 +24,7 @@ public class UpdateUserReq {
 	private String locale;
 	private String remarks;
 
-	@NotBlank
+//	@NotBlank
 	@Email
 	private String email;
 //	@NotBlank
diff --git a/src/main/java/com/ffii/tsms/modules/user/web/UserController.java b/src/main/java/com/ffii/tsms/modules/user/web/UserController.java
index d939da1..bf27805 100644
--- a/src/main/java/com/ffii/tsms/modules/user/web/UserController.java
+++ b/src/main/java/com/ffii/tsms/modules/user/web/UserController.java
@@ -153,19 +153,10 @@ public class UserController{
 	@PatchMapping("/admin-change-password")
 	@ResponseStatus(HttpStatus.NO_CONTENT)
 	@PreAuthorize("hasAuthority('MAINTAIN_USER')")
-	public void adminChangePassword(@RequestBody @Valid ChangePwdReq req) {
+	public void adminChangePassword(@RequestBody @Valid AdminChangePwdReq req) {
 		long id = req.getId();
 		User instance = userService.find(id).orElseThrow(NotFoundException::new);
 
-		logger.info("TEST req: "+req.getPassword());
-		logger.info("TEST instance: "+instance.getPassword());
-//		if (!passwordEncoder.matches(req.getPassword(), instance.getPassword())) {
-//			throw new BadRequestException();
-//		}
-		PasswordRule rule = new PasswordRule(settingsService);
-		if (!PasswordUtils.checkPwd(req.getNewPassword(), rule)) {
-			throw new UnprocessableEntityException(ErrorCodes.USER_WRONG_NEW_PWD);
-		}
 		instance.setPassword(passwordEncoder.encode(req.getNewPassword()));
 		userService.save(instance);
 	}
@@ -188,6 +179,20 @@ public class UserController{
 		return new PasswordRule(settingsService);
 	}
 
+	public static class AdminChangePwdReq {
+		private Long id;
+		@NotBlank
+		private String newPassword;
+
+		public Long getId() { return id; }
+		public Long setId(Long id) { return this.id = id; }
+		public String getNewPassword() {
+			return newPassword;
+		}
+		public void setNewPassword(String newPassword) {
+			this.newPassword = newPassword;
+		}
+	}
 	public static class ChangePwdReq {
 		private Long id;
 		@NotBlank