Merge branch 'main' of http://10.dbnt.co.kr:50501/DBNT/geoinfo_eGov_work

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

@@ -327,12 +327,20 @@ public class LoginController {
 		map.put("name", name);
 
 		Map<String, Object> result = loginService.selectSearchPass(map);
+		Map<String, Object> resultByUserIdOrEmail = loginService.selectSearchPassByUserIdOrEmail(map);
+		map.put("DI", DI);
+		Map<String, Object> resultByDupinfo = loginService.selectSearchPassByDupinfo(map);
 		
-		if (result == null) {
+		if (result == null && resultByUserIdOrEmail == null) {
 			mv.setViewName("body/account/pwNotFind");
 			mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다.");
-		}
+		} else if (result == null && resultByUserIdOrEmail != null) {
-		else {
+			mv.setViewName("body/account/pwNotFind");
+			mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다.");
+		} else if (result == null && resultByDupinfo != null) {
+			mv.setViewName("body/account/pwNotFind");
+			mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다..");
+		} else {
 			mv.setViewName("body/account/pass_post");
 			mv.addObject("hdnCertNum",hdnCertNum);
 			mv.addObject("hdnCertification",hdnCertification);

src/main/java/geoinfo/main/login/service/LoginMapper.java

@@ -30,6 +30,9 @@ public interface LoginMapper {
 	
 
 	Map<String, Object> selectSearchPass(Map<String, Object> map);
+	Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map);
+	Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map);
+	
 
 	void updateSearchPassch(Map<String, Object> map);
 

src/main/java/geoinfo/main/login/service/LoginService.java

@@ -22,6 +22,8 @@ public interface LoginService {
 	Map<String, Object> selectSearchId(Map<String, Object> map) throws Exception;
 	Map<String, Object> selectSearchIdByNameAndPhoneAndDupinfoIsNullAndCertificationYnFalse(Map<String, Object> map) throws Exception;	
 	Map<String, Object> selectSearchPass(Map<String, Object> map) throws Exception;
+	Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception;
+	Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception;
 	void updateSearchPassch(Map<String, Object> map) throws Exception;
 	int selectWebDownLoadLog(Map<String, Object> map);
 	List<Map<String, Object>> selectDownLoadContent(Map<String, Object> map);

src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java

@@ -85,6 +85,17 @@ public class LoginServiceImpl implements LoginService{
 		return loginMapper.selectSearchPass(map);
 	}	
 
+	@Override
+	public Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception {
+		return loginMapper.selectSearchPassByUserIdOrEmail(map);
+	}	
+
+	@Override
+	public Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception {
+		return loginMapper.selectSearchPassByDupinfo(map);
+	}
+
+
 	@Override
 	public void updateSearchPassch(Map<String, Object> map) throws Exception {
 		loginMapper.updateSearchPassch(map);

src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml

@@ -71,57 +71,26 @@
 	</select>	
 	
 	<select id="selectConstructCompanyList" parameterType="map" resultType="egovMap">
-		SELECT
+	    SELECT
-			TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME,
+	        TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME,
-			wmi.USERID,
+	        wmi.USERID,
-			TRIM(wmi.PART_NAME) AS PART_NAME,
+	        TRIM(wmi.PART_NAME) AS PART_NAME,
-			wmi.EMAIL
+	        wmi.EMAIL
-		FROM
+	    FROM
-			web_member_in wmi
+	        web_member_in wmi
-		WHERE
+	    WHERE
-			wmi.CLS = 1
+	        wmi.CLS = 1
-			and wmi.COMPANY_NAME NOT IN ('111', 'a')
+	        AND wmi.COMPANY_NAME IS NOT NULL
-			and wmi.COMPANY_NAME is not NULL 
+	        AND wmi.COMPANY_NAME NOT IN ('111', 'a')
-			and wmi.COMPANY_NAME LIKE  '%' || #{companyName} || '%' 
+	        <choose>
-		UNION					
+	            <when test='companyName != null and companyName.length() >= 2'>
-		SELECT
+	                AND CONTAINS(wmi.COMPANY_NAME, '%' || #{companyName} || '%') > 0
-			TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME,
+	            </when>
-			wmi.USERID,
+	            <otherwise>
-			TRIM(wmi.PART_NAME) AS PART_NAME,
+	                AND 1 = 0
-			wmi.EMAIL
+	            </otherwise>
-		FROM
+	        </choose>
-			web_member_in wmi
+        	AND ROWNUM &lt;= 50
-		WHERE
-			wmi.CLS = 1
-			and wmi.COMPANY_NAME NOT IN ('111', 'a')
-			and wmi.COMPANY_NAME is not NULL 
-			and wmi.USER_NAME like '%' || #{companyName} || '%' 
-		UNION					
-		SELECT
-			TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME,
-			wmi.USERID,
-			TRIM(wmi.PART_NAME) AS PART_NAME,
-			wmi.EMAIL
-		FROM
-			web_member_in wmi
-		WHERE
-			wmi.CLS = 1
-			and wmi.COMPANY_NAME NOT IN ('111', 'a')
-			and wmi.COMPANY_NAME is not NULL 
-			and wmi.USERID like '%' || #{companyName} || '%'
-		UNION					
-		SELECT
-			TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME,
-			wmi.USERID,
-			TRIM(wmi.PART_NAME) AS PART_NAME,
-			wmi.EMAIL
-		FROM
-			web_member_in wmi
-		WHERE
-			wmi.CLS = 1
-			and wmi.COMPANY_NAME NOT IN ('111', 'a')
-			and wmi.COMPANY_NAME is not NULL 
-			and wmi.EMAIL like '%' || #{companyName} || '%'
 	</select>
 	
 	<select id="getDepartments" parameterType="map" resultType="egovMap">

src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml

@@ -182,6 +182,27 @@
 		]]>
 	</select>
 
+	<select id="selectSearchPassByUserIdOrEmail" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
+		<![CDATA[
+		SELECT CLS, USER_NAME, USERID, PASSWD, TO_CHAR(DATETIME,'YYYY-MM-DD') DATETIME, CERTIFICATION_YN
+		FROM WEB_MEMBER_IN
+		WHERE
+			TRIM(USERID) 	= TRIM(#{userId}) OR
+			TRIM(EMAIL) 	= TRIM(#{email})
+		]]>
+	</select>
+
+	<select id="selectSearchPassByDupinfo" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
+		<![CDATA[
+		SELECT CLS, USER_NAME, USERID, PASSWD, TO_CHAR(DATETIME,'YYYY-MM-DD') DATETIME, CERTIFICATION_YN
+		FROM WEB_MEMBER_IN
+		WHERE
+			TRIM(DUPINFO) 	= TRIM(#{DI})
+		]]>
+	</select>
+	
+	
+
     <update id="updateSearchPassch">
     	<![CDATA[
     	UPDATE WEB_MEMBER_IN

src/main/webapp/js/map/main/map.js

@@ -2842,7 +2842,7 @@ function initApp(param){
 	    var allFeatures = []; // 모든 폴리곤 피처를 담을 배열
 	  
 	    var boundaryStyle = {
-	    	    strokeColor: "#0000FF",
+	    	    strokeColor: "#555555",
 	    	    strokeOpacity: 0.8,
 	    	    strokeWidth: 3,
 	    	    fillColor: "transparent",