From 6efb85055c637e7440aa99124b4c6a1f939d8aab Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Mon, 6 May 2024 18:15:22 +0800
Subject: [PATCH] update

---
 .../tsms/modules/user/req/UpdateUserReq.java  | 18 ++++++++---------
 .../modules/user/service/GroupService.java    | 20 +++++++++++++++++++
 .../modules/user/service/UserService.java     | 18 ++++++-----------
 .../modules/user/web/GroupController.java     |  8 ++++++++
 4 files changed, 43 insertions(+), 21 deletions(-)

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 531eba6..87838be 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
@@ -27,8 +27,8 @@ public class UpdateUserReq {
 	@NotBlank
 	@Email
 	private String email;
-	@NotBlank
-	private String department;
+//	@NotBlank
+//	private String department;
 
 	// @NotNull
 	private List<Integer> addGroupIds;
@@ -140,12 +140,12 @@ public class UpdateUserReq {
 		this.email = email;
 	}
 
-	public String getDepartment() {
-		return department;
-	}
-
-	public void setDepartment(String department) {
-		this.department = department;
-	}
+//	public String getDepartment() {
+//		return department;
+//	}
+//
+//	public void setDepartment(String department) {
+//		this.department = department;
+//	}
 
 }
diff --git a/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java b/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java
index f7cc523..2d5a694 100644
--- a/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java
+++ b/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java
@@ -173,4 +173,24 @@ public class GroupService extends AbstractBaseEntityService<Group, Long, GroupRe
 				Map.of(Params.ID, id));
 	}
 
+
+	@Transactional(rollbackFor = Exception.class)
+	public List<Map<String, Object>> listGroupAuth(Map<String, Object> args) {
+
+		StringBuilder sql = new StringBuilder("SELECT"
+				+ "	a.id, "
+				+ " a.module,"
+				+ " a.authority,"
+				+ " a.name,"
+				+ " a.description, ");
+//		if (args.containsKey("userId"))
+//			sql.append(" EXISTS(SELECT 1 FROM group_authority WHERE authority = a.authority AND groupId = :groupId) AS v");
+//		else
+			sql.append(" 0 AS v");
+			sql.append(" FROM authority a"
+				+ " ORDER BY a.module, a.name");
+
+		return jdbcDao.queryForList(sql.toString(), args);
+	}
+
 }
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 2ad8ff5..5416a46 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
@@ -3,15 +3,12 @@ package com.ffii.tsms.modules.user.service;
 import java.io.UnsupportedEncodingException;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Date;
-import java.util.stream.Collectors;
 
 import com.ffii.tsms.modules.common.service.AuditLogService;
-import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +38,6 @@ import jakarta.persistence.Table;
 import com.ffii.core.utils.JsonUtils;
 import com.ffii.tsms.modules.common.SecurityUtils;
 
-import jakarta.mail.internet.InternetAddress;
-
 @Service
 public class UserService extends AbstractBaseEntityService<User, Long, UserRepository> {
 	private static final String USER_AUTH_SQL = "SELECT a.authority"
@@ -91,9 +86,9 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 		return userRepository.findByUsernameAndDeletedFalse(username);
 	}
 
-	public Map<String, Object> softDelete(User user) {
+	public void softDelete(User user) {
 
-        // =====GET OLD AUDIT LOG=====//
+		// =====GET OLD AUDIT LOG=====//
 		String tableName = user.getClass().getAnnotation(Table.class).name();
 		StringBuilder sql = new StringBuilder("SELECT * FROM " + tableName + " WHERE id = :id");
 		String oldValueJson = null;
@@ -124,8 +119,6 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 				newValueJson);
 		// =====GET NEW AUDIT LOG=====//
 
-		return Map.of(
-				"id", user.getId());
 	}
 
 	// @Transactional(rollbackFor = Exception.class)
@@ -148,7 +141,8 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 				+ " u.email,"
 				+ " u.phone1,"
 				+ " u.phone2,"
-				+ " u.remarks "
+				+ " u.remarks, "
+				+ " ug.groupId "
 				+ " FROM `user` u"
 				+ " left join user_group ug on u.id = ug.userId"
 				+ " where u.deleted = false");
@@ -201,7 +195,7 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 	}
 
 	private User saveOrUpdate(User instance, UpdateUserReq req) {
-	
+
 		if (instance.getId() == null){
 			req.setLocked(false);
 		}
@@ -263,7 +257,7 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 		User instance = new User();
 		instance.setPassword(pwdHash);
 		instance = saveOrUpdate(instance, req);
-		
+
 		// Locale locale = instance.getLocale() != null ? LocaleUtils.from(instance.getLocale()) : Locale.ENGLISH;
 		// mailService.send(
 		// 		MailRequest.builder()
diff --git a/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java b/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java
index 89752b4..8ef9d57 100644
--- a/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java
+++ b/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java
@@ -77,4 +77,12 @@ public class GroupController{
 						.build()));
 	}
 
+	@GetMapping("/auth/combo")
+	public RecordsRes<Map<String, Object>> authComboJson(HttpServletRequest request) throws ServletRequestBindingException {
+		System.out.println(request);
+		return new RecordsRes<>(groupService.listGroupAuth(
+				CriteriaArgsBuilder.withRequest(request)
+						.build()));
+	}
+
 }