충돌 수정

src/main/java/geoinfo/main/login/LoginController.java

@@ -58,6 +58,7 @@ import egovframework.com.cmm.EgovMessageSource;
 import egovframework.com.cmm.service.EgovProperties;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.GeoinfoCommon;
+import geoinfo.drilling.input.service.DrillingInputService;
 import geoinfo.main.login.service.LoginService;
 import geoinfo.main.main.MainController;
 import geoinfo.map.mapControl.service.MapControlService;
@@ -80,6 +81,9 @@ public class LoginController {
 	@Resource(name = "loginService")
 	private LoginService loginService;
 
+	@Resource(name = "drillingInputService")
+	DrillingInputService drillingInputService;
+    
 	@Resource(name="egovMessageSource")
 	EgovMessageSource egovMessageSource;
 
@@ -802,7 +806,7 @@ public class LoginController {
 					// 로그인 횟수 제한 : 10분설정시 1/(24*6) 5분설정시 1/(24*12)
 					map.put("userid", userid);
 					Map<String, Object> selectWebMemberIn = loginService.selectWebMemberIn(map);
-					
+					cls = selectWebMemberIn.get("cls").toString();
 					
 					boolean adminYn = false;
 
@@ -1041,6 +1045,26 @@ public class LoginController {
 							}
 
 							else {
+								// 국토부 소속+산하기관 계정만 로그인 허용(국토부소속+산하기관:GL_CODE = 01)
+								HashMap<String, Object> userGMap = drillingInputService.getOrganizationUserGlGmGsGfCodes(userid);
+								String glCode = MyUtil.getStringFromObject( userGMap.get("v_gl") );
+								if (!"01".equals(glCode)) {
+									msg = "<script>alert('해당 계정은 현재 잠김 상태입니다');</script>";
+									url = "index.do?cntyn=0";
+									// --------------- 로그인 세션 정보 초기화 ---------------------
+									request.getSession().removeAttribute("USERID");
+									request.getSession().removeAttribute("USERNAME");
+									request.getSession().removeAttribute("COMPANYNAME");
+									request.getSession().removeAttribute("MASTERCODE");
+									request.getSession().removeAttribute("CLS");
+									request.getSession().removeAttribute("GOVECODE");
+									request.getSession().removeAttribute("USERIP"); // IP 추가
+									request.getSession().removeAttribute("USERAGENT"); // 접속 브라우져 정보
+									request.getSession().removeAttribute("PARTNNAME");
+									request.getSession().removeAttribute("PHONE");
+									request.getSession().removeAttribute("EMAIL");
+									// --------------- 로그인 세션 정보 초기화 END ----------------
+								} else {
 								
 									// 로그인 성공시 실패회수 초기화
 									map.put("loginCount", 0);
@@ -1110,6 +1134,7 @@ public class LoginController {
 									}
 								}
 							}
+						}
 					} else {
 						if ( loginCnt  >= 5) {
 							msg = "<script>alert('현재 "+loginCnt+"회이상 로그인 실패하여 로그인이 제한되었습니다.관리자(031-910-0402)에게 문의바랍니다.');</script>";

src/main/java/geoinfo/regi/basicInfo/BasicController.java

@@ -51,6 +51,7 @@ import geoinfo.regi.common.service.CommonService;
 import geoinfo.regi.selectClassInfo.service.SelectClassService;
 import geoinfo.regi.status.RegiController;
 import geoinfo.util.MyUtil;
+import geoinfo.util.StringUtil;
 import ictway.comm.util.strUtil;
 import ictway.comm.web.WebUtil;
 
@@ -870,17 +871,17 @@ public class BasicController {
 				params.put("depthTo", wUtil.isNullNode(nDEPTH_TO));
 				params.put("rockType", wUtil.isNullNode(nROCK_TYPE));
 				params.put("rqd", wUtil.isNullNode(nRQD));
-				params.put("rqdDesc", wUtil.isNullNode(nRQD_DESC)); //비고 1
+				params.put("rqdDesc", StringUtil.removeTabStr(wUtil.isNullNode(nRQD_DESC)));// 비고 1
 				params.put("jn", wUtil.isNullNode(nJN));
-				params.put("jnDesc", wUtil.isNullNode(nJN_DESC)); 	//비고 2
+				params.put("jnDesc", StringUtil.removeTabStr(wUtil.isNullNode(nJN_DESC)));	// 비고2
 				params.put("jr", wUtil.isNullNode(nJR));
-				params.put("jrDesc", wUtil.isNullNode(nJR_DESC));	 //비고 3
+				params.put("jrDesc", StringUtil.removeTabStr(wUtil.isNullNode(nJR_DESC)));	// 비고 3
 				params.put("ja", wUtil.isNullNode(nJA));
-				params.put("jaDesc", wUtil.isNullNode(nJA_DESC));	 //비고 4
+				params.put("jaDesc", StringUtil.removeTabStr(wUtil.isNullNode(nJA_DESC)));	// 비고 4
 				params.put("jw", wUtil.isNullNode(nJW));
-				params.put("jwDesc", wUtil.isNullNode(nJW_DESC));	 //비고 5
+				params.put("jwDesc", StringUtil.removeTabStr(wUtil.isNullNode(nJW_DESC)));	// 비고 5
 				params.put("srf", wUtil.isNullNode(nSRF));
-				params.put("srfDesc", wUtil.isNullNode(nSRF_DESC));	 //비고 6
+				params.put("srfDesc", StringUtil.removeTabStr(wUtil.isNullNode(nSRF_DESC)));// 비고 6
 				params.put("userId", request.getSession().getAttribute("USERID"));
 
 				basicService.insertTempQ(params);
@@ -2153,9 +2154,9 @@ public class BasicController {
 				params.put("fieldperCasingDia", wUtil.isNullNode(nFIELDPER_CASING_DIA));
 				params.put("fieldperCasingHeight", wUtil.isNullNode(nFIELDPER_CASING_HEIGHT));
 				params.put("fieldperAvgPermeability", wUtil.isNullNode(nFIELDPER_AVG_PERMEABILITY));
-				params.put("fieldperInspectedBy", wUtil.isNullNode(nFIELDPER_INSPECTED_BY));
+				params.put("fieldperInspectedBy", StringUtil.removeTabStr(wUtil.isNullNode(nFIELDPER_INSPECTED_BY)));
-				params.put("fieldperCheckedBy", wUtil.isNullNode(nFIELDPER_CHECKED_BY));
+				params.put("fieldperCheckedBy", StringUtil.removeTabStr(wUtil.isNullNode(nFIELDPER_CHECKED_BY)));
-				params.put("fieldperRemark", wUtil.isNullNode(nFIELDPER_REMARK));
+				params.put("fieldperRemark", StringUtil.removeTabStr(wUtil.isNullNode(nFIELDPER_REMARK)));
 
 				// ----------------------file처리---------------------
 				// 현장수압 graph

src/main/java/geoinfo/util/StringUtil.java

@@ -1530,4 +1530,19 @@ public class StringUtil {
 		
 	}
 
+	/**
+	 * <pre>
+	 * \t 제거하기
+	 * </pre>
+	 * 
+	 * @return String
+	 * @changed 2025.11.03 YJI
+	 */
+	public static String removeTabStr(String str) {
+		String rtnStr = "";
+		if (str != null && !"".equals(str)) {
+			rtnStr = str.replace("\t", "");
+		}
+		return rtnStr;
+	}
 }