From 099554d809aae650169420203b6c462ae94f40bd Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 18 Dec 2024 09:04:54 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EC=9D=98=20=EC=97=85=EB=AC=B4?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/base/web/UserController.java  | 17 +++++++++++------
 .../xit/fims/cmmn/service/bean/StngBean.java    |  6 ++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/base/web/UserController.java b/src/main/java/cokr/xit/fims/base/web/UserController.java
index 3e9ade78..638a7977 100644
--- a/src/main/java/cokr/xit/fims/base/web/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/web/UserController.java
@@ -14,6 +14,7 @@ import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.code.service.CodeQuery;
 import cokr.xit.base.code.service.CodeService;
 import cokr.xit.base.code.service.bean.CodeBean;
+import cokr.xit.base.security.Authority;
 import cokr.xit.base.security.SecuredUserInfo;
 import cokr.xit.base.security.access.service.AuthorityService;
 import cokr.xit.base.user.UserQuery;
@@ -117,12 +118,16 @@ public class UserController extends cokr.xit.base.user.web.UserController<FimsUs
 		boolean isPublicOfficer = fimsUser.getCntnSeCd().equals("01");
 		userInfo.getInfo().put("isPublicOfficer", isPublicOfficer);
 
-		CodeQuery codeQuery = new CodeQuery();
-		codeQuery.setGroupIDs("FIM054");
-		List<DataObject> taskList = codeBean.getCodeList(codeQuery);
-		String[] taskRoles = taskList.stream().map((item) -> { return "ROLE_"+item.string("CODE"); })
-				.toList().toArray(new String[taskList.size()]);
-		boolean hasTaskAuth = userInfo.hasAuthorities(taskRoles);
+		List<String> user_auths = userInfo.getAuthorities().stream().map(Authority::getAuthority).toList();
+		List<String> user_taskList = codeBean.getCodeList(new CodeQuery().setGroupIDs("FIM054"))
+			.stream().map(row -> row.string("CODE")).toList()
+			.stream().filter(task -> {
+				for (String auth: user_auths)
+					if (auth.contains(task))
+						return true;
+					return false;
+				}).toList();
+		boolean hasTaskAuth = !user_taskList.isEmpty();
 		userInfo.getInfo().put("hasTaskAuth", hasTaskAuth);
 
 
diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java
index a4c5a307..de67d9fc 100644
--- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java
+++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java
@@ -115,8 +115,10 @@ public class StngBean extends AbstractBean {
 
 					for(int i=0; i<taskList.size(); i++) {
 						String task = taskList.get(i);
-						if(authId.equals("ROLE_"+task)) {
-							availableTaskList.add(task);
+						if(authId.contains(task)) {
+							if(!availableTaskList.contains(task)) {
+								availableTaskList.add(task);
+							}
 						}
 					}
 				}