From 0e82ee9ca20bd249281b0aa1d4f7e2e308cfe4b6 Mon Sep 17 00:00:00 2001
From: nhj <nhj@DESKTOP-NN0D3BJ.mshome.net>
Date: Fri, 28 Nov 2025 08:40:51 +0900
Subject: [PATCH] =?UTF-8?q?SR/=EB=B3=B4=EA=B3=A0=EC=84=9C/=EC=9E=90?=
 =?UTF-8?q?=EC=82=B0=20=ED=98=84=ED=99=A9=20=ED=8F=AC=ED=8B=80=EB=A6=BF=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../srm/controller/ReportCheckController.java | 10 +++++++--
 .../sqlmap/itms/rem/AdminServiceMapper.xml    | 22 +++++++++++++------
 .../sqlmap/itms/srm/SvcDeskMapper.xml         |  4 +++-
 .../sqlmap/itms/sys/UserManageMapper.xml      | 14 +++++++++---
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java
index 475c1c2b..e359d852 100644
--- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java
+++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java
@@ -74,13 +74,19 @@ public class ReportCheckController
     	// 토큰정보 획득
     	TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request);
     	
-    	String strGrpId = tokenInfo.getStrGRP_ID();
-    	String strRole  = tokenInfo.getAuthorities();
+    	String strGrpId = CommonUtil.nvl(tokenInfo.getStrGRP_ID());
+    	String strRole  = CommonUtil.nvl(tokenInfo.getAuthorities());
     	
     	log.info("strGrpId [{}]", strGrpId);
     	log.info("strRole [{}]" , strRole);
     	log.info("순서 [{}]" , strRole.indexOf("ROLE_ADMIN"));
     	
+    	// 2025.11.24 나혁제 권한미부여 상태 조회불가  
+    	if(strGrpId.equals(""))
+    	{
+    		strGrpId="X";
+    	}
+    	
     	// 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 
     	if(!strGrpId.equals("GROUP_00000000000000") && strRole.indexOf("ROLE_ADMIN")<0) 
     	{
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/AdminServiceMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/AdminServiceMapper.xml
index 0c76c8c4..9e48b362 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/AdminServiceMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/AdminServiceMapper.xml
@@ -4,6 +4,7 @@
 
 <mapper namespace="com.urpsys.itmsapi.rem.dao.AdminServiceDao">
 
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<resultMap type="java.util.LinkedHashMap" id="serviceVo">
 		<result property="inServiceCode"  column="IN_SERVICE_CODE"/>
 		<result property="vcServiceName"  column="VC_SERVICE_NAME"/>
@@ -11,6 +12,7 @@
 		<result property="inChargeUser"   column="IN_CHARGE_USER"/>
 		<result property="vcChargeUser"   column="VC_CHARGE_USER"/>
 		<result property="txDefaultForm"  column="TX_DEFAULT_FORM"/>
+		<result property="inSortSn"       column="IN_SORT_SN"     />
 	</resultMap>
 	
 	<resultMap type="java.util.LinkedHashMap" id="approval">
@@ -26,6 +28,7 @@
 		</if>
 	</sql>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="searchAdminService" parameterType="java.util.HashMap" resultMap="serviceVo">
 		SELECT IN_SERVICE_CODE
 		     , VC_SERVICE_NAME
@@ -33,6 +36,7 @@
 		     , IN_CHARGE_USER
 		     , VC_CHARGE_USER
 		     , '' AS TX_DEFAULT_FORM
+		     , IFNULL(IN_SORT_SN, 9999) AS IN_SORT_SN
 		  FROM CM_SERVICE 
 		<include refid="searchFilter"/>
 		ORDER BY IN_SERVICE_CODE
@@ -62,7 +66,7 @@
 		 ORDER BY IN_ORDER
 	-->	 
 		 
-	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceBySeq" parameterType="int" resultMap="serviceVo">
 		/* AdminServiceDao.getServiceBySeq */
 		SELECT IN_SERVICE_CODE
@@ -71,6 +75,7 @@
 		     , B.ESNTL_ID AS IN_CHARGE_USER
              , B.USER_NM  AS VC_CHARGE_USER
 		     , TX_DEFAULT_FORM
+		     , IN_SORT_SN
 		  FROM CM_SERVICE A 
 		  LEFT OUTER JOIN TB_TASK_USER_INFO B ON A.IN_CHARGE_USER = B.ESNTL_ID
 		 WHERE A.IN_SERVICE_CODE=#{value}
@@ -87,7 +92,7 @@
 		 ORDER BY IN_ORDER
 	</select>
 	
-	
+	<!-- 2025.11.24 나혁제 정렬순서(IN_SORT_SN) 추가 -->
 	<insert id="addForm" parameterType="java.util.Map" useGeneratedKeys="true" keyProperty="inServiceCode">
 	    /* AdminServiceDao.addForm */
 		INSERT INTO CM_SERVICE 
@@ -97,6 +102,7 @@
 		 , IN_CHARGE_USER
 		 , VC_CHARGE_USER
 		 , TX_DEFAULT_FORM
+		 , IN_SORT_SN
 		) 
 		VALUES
 		(
@@ -105,6 +111,7 @@
 		, #{inChargeUser}
 		, "${vcChargeUser}"
 		, "${txDefaultForm}"
+		, #{inSortSn}
 		)
 	</insert>
 	
@@ -127,11 +134,12 @@
 	
 	<update id="updateForm" parameterType="java.util.Map">
 		UPDATE CM_SERVICE 
-		   SET VC_SERVICE_NAME="${vcServiceName}"
-		     , TX_SERVICE_DESC="${txServiceDesc}"
-		     , IN_CHARGE_USER=#{inChargeUser}
-		     , VC_CHARGE_USER="${vcChargeUser}"
-		     , TX_DEFAULT_FORM="${txDefaultForm}"
+		   SET VC_SERVICE_NAME ="${vcServiceName}"
+		     , TX_SERVICE_DESC ="${txServiceDesc}"
+		     , IN_CHARGE_USER  =#{inChargeUser}
+		     , VC_CHARGE_USER  ="${vcChargeUser}"
+		     , TX_DEFAULT_FORM ="${txDefaultForm}"
+		     , IN_SORT_SN      =#{inSortSn}
 		 WHERE IN_SERVICE_CODE=#{inServiceCode}
 	</update>
 	
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml
index 54b4b231..cf7a28fc 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml
@@ -201,10 +201,12 @@
 		<include refid="searchFilter"/>
 	</select>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
 		/* SvcDeskDao.getServiceCombo */
 		SELECT A.IN_SERVICE_CODE AS VALUE
 		     , A.VC_SERVICE_NAME AS LABEL
+		     , IFNULL(IN_SORT_SN, 9999) AS IN_SORT_SN
 		     , @I:=@I+1
 		     ,
 		<if test="value1 != 0 ">
@@ -215,7 +217,7 @@
 		</if> 		
 		FROM CM_SERVICE A
 		   , (SELECT @I:=0) AS DM
-		ORDER BY A.IN_SERVICE_CODE
+		ORDER BY IFNULL(IN_SORT_SN, 9999), A.IN_SERVICE_CODE
 	</select>
 	
 	<select id="getinIncidentSeq" parameterType="java.util.HashMap" resultType="int">
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/UserManageMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/UserManageMapper.xml
index 85ba3acc..f1d223a2 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/UserManageMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/UserManageMapper.xml
@@ -4,6 +4,7 @@
 
 <mapper namespace="com.urpsys.itmsapi.sys.dao.UserManageDao">	
 
+	<!-- 2025.11.24 나혁제 id 검색시에도 like 검색으로 변경  -->
     <select id="selectUserList_S" parameterType="java.util.LinkedHashMap" resultType="egovMap">
 		SELECT 
     		 uniqId
@@ -33,7 +34,9 @@
 				     , USER_STACD           sttus
 				     , JOIN_DTM             sbscrbDe
 				     , FORMAT_PHONE(MOVE_TELNO)  as fmtMoblphonNo
-    			  FROM    TB_TASK_USER_INFO
+    			  FROM TB_TASK_USER_INFO
+    			 WHERE 1=1
+    			   AND (LIST_INQ_YN IS NULL OR LIST_INQ_YN != 'Y') 
     		   ) A 
          WHERE 1=1
 	     	<if test='sbscrbSttus != null and sbscrbSttus neq "0" and sbscrbSttus neq ""'>
@@ -41,7 +44,7 @@
 			</if> 
         	<if test="@com.urpsys.baseapi.egov.util.EgovMybaitsUtil@isNotEmpty(searchKeyword)">
         		<if test="searchCondition == 0">
-        			AND userId LIKE #{searchKeyword}
+        			AND userId LIKE '%' #{searchKeyword} '%'
         		</if>
         		<if test="searchCondition == 1">
         			AND userNm LIKE '%' #{searchKeyword} '%'
@@ -49,8 +52,11 @@
         	</if>
         ORDER BY sbscrbDe DESC
         LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+        
     </select>
     
+    <!-- 2025.11.24 나혁제 id 검색시에도 like 검색으로 변경  -->
+    <!-- AND userId LIKE #{searchKeyword} -->
     <select id="selectUserListTotCnt_S" parameterType="java.util.LinkedHashMap" resultType="int">
         SELECT COUNT(1) totcnt
           FROM ( 
@@ -67,6 +73,8 @@
                 	,  USER_STACD            sttus
                 	,  JOIN_DTM              sbscrbDe
              	  FROM    TB_TASK_USER_INFO
+             	 WHERE 1=1
+    			   AND (LIST_INQ_YN IS NULL OR LIST_INQ_YN != 'Y') 
         	) A
     	 WHERE 1=1
         	<if test='sbscrbSttus != null and sbscrbSttus neq "0" and sbscrbSttus neq ""'>
@@ -74,7 +82,7 @@
         	</if>
         	<if test="@com.urpsys.baseapi.egov.util.EgovMybaitsUtil@isNotEmpty(searchKeyword)">
         		<if test="searchCondition == 0">
-        			AND userId LIKE #{searchKeyword}
+        			AND userId LIKE '%' #{searchKeyword} '%'
         		</if>
         		<if test="searchCondition == 1">
         			AND userNm LIKE '%' #{searchKeyword} '%'