From f183b9fc17bcddc9162761e2e8f8ed5816528684 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 7 May 2024 16:09:22 +0800
Subject: [PATCH] update user group

---
 .../tsms/modules/user/service/GroupService.java     |  7 +++----
 .../tsms/modules/user/service/pojo/UserRecord.java  |  8 ++++++++
 .../ffii/tsms/modules/user/web/GroupController.java | 13 ++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

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 2d5a694..7112da3 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
@@ -183,14 +183,13 @@ public class GroupService extends AbstractBaseEntityService<Group, Long, GroupRe
 				+ " 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
+		if (args.containsKey("groupId"))
+			sql.append(" EXISTS(SELECT 1 FROM group_authority ga WHERE a.id = ga.authId 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/pojo/UserRecord.java b/src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java
index 6af65aa..ffffb2d 100644
--- a/src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java
+++ b/src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java
@@ -25,6 +25,8 @@ public class UserRecord {
   private String phone2;
   private String remarks;
 
+  private Long groupId;
+
   public Integer getId() {
     return id;
   }
@@ -152,4 +154,10 @@ public class UserRecord {
     this.remarks = remarks;
   }
 
+  public Long getGroupId() {
+    return groupId;
+  }
+
+  public void setGroupId(Long groupId) { this.groupId = groupId; }
+
 }
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 8ef9d57..087814e 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
@@ -1,5 +1,6 @@
 package com.ffii.tsms.modules.user.web;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -77,12 +78,14 @@ public class GroupController{
 						.build()));
 	}
 
-	@GetMapping("/auth/combo")
-	public RecordsRes<Map<String, Object>> authComboJson(HttpServletRequest request) throws ServletRequestBindingException {
+	@GetMapping("/auth/combo/{id}")
+	public RecordsRes<Map<String, Object>> authComboJson(HttpServletRequest request, @PathVariable("id") int id) throws ServletRequestBindingException {
 		System.out.println(request);
-		return new RecordsRes<>(groupService.listGroupAuth(
-				CriteriaArgsBuilder.withRequest(request)
-						.build()));
+		Map<String, Object> args = new HashMap<>();
+		if (id != 0)
+			args.put("groupId", id);
+
+		return new RecordsRes<>(groupService.listGroupAuth(args));
 	}
 
 }