시스템 메뉴 불편사항 개선

src/main/resources/sqlmap/mappers/com/ComAuthPrgMngMapper.xml

@@ -59,7 +59,7 @@
 		  FROM SM_COM_PRG
 		 WHERE SYS_CD = #{sysCd}
 		   AND USE_YN = 'Y'
-		   AND PRG_NM LIKE '%'||#{prgNm}||'%'
+		   AND ( PRG_NM LIKE '%'||#{prgNm}||'%' OR PRG_URL LIKE '%'||#{prgNm}||'%' )
 		 ORDER BY PRG_NM
     </select>
 

src/main/resources/sqlmap/mappers/com/ComAuthUserMngMapper.xml

@@ -64,8 +64,10 @@
 		     , B.USER_NM
 		     , A.CMPN_CD
 		     , B.LGIN_ID
+		     , C.DUTY_TYPE_NM
 		  FROM SM_COM_AUTHGRPUSER A
 		  LEFT JOIN SM_COM_USER B ON A.CMPN_CD = B.CMPN_CD AND A.USER_ID = B.USER_ID
+		  LEFT JOIN ZEHR_PHM_INFO_R C ON A.CMPN_CD = C.CMPN_CD AND B.EMP_NO = C.EMP_NO
 		 WHERE A.CMPN_CD = #{cmpnCd}
 		   AND A.AUTH_GRP_ID = #{authGrpId}
 		<if test="idNm != '' and idNm != null">

src/main/resources/sqlmap/mappers/com/ComPrgMapper.xml

@@ -21,11 +21,12 @@
 		   AND SYS_CD = #{sysCd}
         </if>
         <if test="prgNm != '' and prgNm != null ">
-		   AND PRG_NM LIKE '%'||#{prgNm}||'%'
+		   AND ( PRG_NM LIKE '%'||#{prgNm}||'%' OR PRG_URL LIKE '%'||#{prgNm}||'%' )
         </if>
         <if test="useYn != 'all'">
 		   AND USE_YN = #{useYn}
         </if>
+        ORDER BY PRG_URL
     </select>
 
     <insert id="saveComPrgRegInsert" parameterType="sgc.portal.com.com.model.Program">

src/main/resources/sqlmap/mappers/com/ComUserMngMapper.xml

@@ -38,7 +38,7 @@
            AND A.EXPT_USER_DCD != '10'
             </if>
         </if>
-         ORDER BY A.DEPT_CD, A.USER_NM
+         ORDER BY A.EXPT_USER_DCD, A.DEPT_CD, A.EMP_NO
     </select>
 
     <insert id="insertComUserMng" parameterType="map">

src/main/resources/sqlmap/mappers/sym/LoginMapper.xml

@@ -167,7 +167,7 @@
 		SELECT COUNT(*)
 		  FROM SM_COM_USER
 		 WHERE CMPN_CD = #{cmpnCd}
-		   AND LGIN_ID = #{lginId}
+		   AND UPPER(LGIN_ID) = UPPER(#{lginId})
 		   AND PSWD_FAIL_DT = TO_CHAR(SYSDATE, 'YYYYMMDD')
 		   AND PSWD_FAIL_CNT >= (SELECT PW_ERR_CNT FROM SM_COM_PWPOLICY WHERE POLICY_ID = (SELECT MAX(POLICY_ID) FROM SM_COM_PWPOLICY))
 	]]></select>
@@ -184,7 +184,7 @@
 		   SET PSWD_FAIL_DT 	= TO_CHAR(SYSDATE, 'YYYYMMDD')
 			 , PSWD_FAIL_CNT 	= ( CASE WHEN PSWD_FAIL_DT = TO_CHAR(SYSDATE, 'YYYYMMDD') THEN NVL(PSWD_FAIL_CNT,0) + 1 ELSE 1 END )
 		 WHERE CMPN_CD = #{cmpnCd}
-		   AND LGIN_ID = #{lginId}
+		   AND UPPER(LGIN_ID) = UPPER(#{lginId})
 	]]></update>
 
 	<select id="selectPasswordExpireCheck" parameterType="map" resultType="String"><![CDATA[
@@ -452,7 +452,7 @@
 		SELECT SCRT_NO
 		  FROM SM_COM_USER
 		 WHERE CMPN_CD = #{cmpnCd}
-		   AND LGIN_ID = #{lginId}
+		   AND UPPER(LGIN_ID) = UPPER(#{lginId})
     ]]></select>
     
      <select id="selectComPasswordPolicyView" parameterType="map" resultType="easyHashMap"><![CDATA[

src/main/webapp/ux/com/comAuthUserMng.xml

@@ -43,6 +43,7 @@
 						<w2:column id="authGrpId" name="권한그룹아이디" dataType="text" />
 						<w2:column id="userId" name="사용자아이디" dataType="text" />
 						<w2:column id="userNm" name="사용자명" dataType="text" />
+						<w2:column id="dutyTypeNm" name="재직여부" dataType="text" />
 						<w2:column id="lginId" name="로그인아이디" dataType="text" />
 					</w2:columnInfo>
 				</w2:dataList>
@@ -586,9 +587,11 @@
 										<w2:column blockSelect="false" displayMode="label" id="column44" inputType="text"
 											style="height:30px;" value="권한그룹ID" width="70" hidden="true" />
 										<w2:column blockSelect="false" displayMode="label" id="column43" inputType="text"
-											style="height:30px;" value="로그인ID" width="150" useFilter="true" />
+											style="height:30px;" value="로그인ID" width="100" useFilter="true" />
 										<w2:column blockSelect="false" displayMode="label" id="column41" inputType="text"
-											style="height:30px;" value="성명" width="150" useFilter="true" />
+											style="height:30px;" value="성명" width="100" useFilter="true" />
+										<w2:column blockSelect="false" displayMode="label" id="column50" inputType="text"
+											style="height:30px;" value="재직여부" width="100" useFilter="true" />
 										<w2:column blockSelect="false" displayMode="label" id="column45" inputType="text"
 											style="height:30px;" value="사용자ID" width="70" hidden="true" />
 									</w2:row>
@@ -603,6 +606,8 @@
 											style="height:30px" width="70" />
 										<w2:column blockSelect="false" displayMode="label" id="userNm" inputType="text" readOnly="true"
 											style="height:30px" width="100" />
+										<w2:column blockSelect="false" displayMode="label" id="dutyTypeNm" inputType="text" readOnly="true"
+											style="height:30px" width="100" />
 										<w2:column blockSelect="false" displayMode="label" id="userId" inputType="text" style="height:30px"
 											width="70" />
 									</w2:row>

src/main/webapp/ux/com/comCommMng.xml

@@ -185,12 +185,13 @@
         var rowidx = grdData.getFocusedRowIndex();
         var rowidx2 = grdData2.getFocusedRowIndex();
         var commCdId = dcdataList1.getCellData( rowidx , "commCdId" );
-
+		
         if(scwin.grdGb == "M"){
             dcdataList1.insertRow(rowidx+1);
             dcdataList1.setCellData( rowidx+1 , "cmpnCd" , selCmpn.getValue() );
+            dcdataList1.setCellData( rowidx+1 , "sysCd" , selSysCd.getValue() );
             dcdataList1.setCellData( rowidx+1 , "useYn" , "Y" );
-            grdData.setFocusedCell( rowidx+1 , "sysCd" , true );
+            grdData.setFocusedCell( rowidx+1 , "commCd" , true );
         } else {
             dcdataList2.insertRow(rowidx2+1);
             dcdataList2.setCellData( rowidx2+1 , "useYn" , "Y" ); //사용여부 사용으로 체크