From 6fbff4fdabb29f88fa4c46f15946c90af2ee4230 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Tue, 2 Jul 2024 18:17:59 +0800
Subject: [PATCH] update project & user

---
 .../modules/project/service/ProjectsService.kt     |  2 +-
 .../tsms/modules/user/service/UserService.java     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
index 2748323..bc3fbd4 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
@@ -111,7 +111,7 @@ open class ProjectsService(
                 code = project.code!!,
                 name = project.name!!,
                 status = project.status,
-                tasks = projectTaskRepository.findAllByProject(project).mapNotNull { pt -> pt.task },
+                tasks = projectTaskRepository.findAllByProject(project).mapNotNull { pt -> pt.task }.sortedBy { it.taskGroup?.id },
                 milestones = milestoneRepository.findAllByProject(project)
                     .filter { milestone -> milestone.taskGroup?.id != null }
                     .associateBy { milestone -> milestone.taskGroup!!.id!! }.mapValues { (_, milestone) ->
diff --git a/src/main/java/com/ffii/tsms/modules/user/service/UserService.java b/src/main/java/com/ffii/tsms/modules/user/service/UserService.java
index 089fb00..1e713d2 100644
--- a/src/main/java/com/ffii/tsms/modules/user/service/UserService.java
+++ b/src/main/java/com/ffii/tsms/modules/user/service/UserService.java
@@ -229,6 +229,13 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 		 List<Map<String, Integer>> authBatchDeleteValues = req.getRemoveAuthIds().stream()
 		 		.map(authId -> Map.of("userId", (int)id, "authId", authId))
 		 		.collect(Collectors.toList());
+		if (!authBatchDeleteValues.isEmpty()) {
+			jdbcDao.batchUpdate(
+					"DELETE FROM user_authority"
+							+ " WHERE userId = :userId ",
+//							+ "AND authId = :authId",
+					authBatchDeleteValues);
+		}
 		 if (!authBatchInsertValues.isEmpty()) {
 		 	jdbcDao.batchUpdate(
 		 			"INSERT IGNORE INTO user_authority (userId, authId)"
@@ -236,13 +243,6 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 		 			authBatchInsertValues);
 		 }
 
-		 if (!authBatchDeleteValues.isEmpty()) {
-		 	jdbcDao.batchUpdate(
-		 			"DELETE FROM user_authority"
-		 					+ " WHERE userId = :userId ",
-//							+ "AND authId = :authId",
-		 			authBatchDeleteValues);
-		 }
 		return instance;
 	}