DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:0227785269cae104c2476346afd316ee5a9d4bd7
Branches Tags
DBNT:main
DBNT:master
DBNT:cks
..
compare: DBNT:6c6451220ad283faef60726eed6c49468a8db015
Branches Tags
DBNT:main
DBNT:master
DBNT:cks

No commits in common. "0227785269cae104c2476346afd316ee5a9d4bd7" and "6c6451220ad283faef60726eed6c49468a8db015" have entirely different histories.
0227785269 ... 6c6451220a

7 changed files with 57 additions and 71 deletions
Show Stats Expand all files Collapse all files

14
src/main/java/geoinfo/main/login/LoginController.java
View File

@ -327,20 +327,12 @@ 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 && resultByUserIdOrEmail == null) {
if (result == null) {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다.");
} else if (result == null && resultByUserIdOrEmail != null) {
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 {
}
else {
mv.setViewName("body/account/pass_post");
mv.addObject("hdnCertNum",hdnCertNum);
mv.addObject("hdnCertification",hdnCertification);

3
src/main/java/geoinfo/main/login/service/LoginMapper.java
View File

@ -30,9 +30,6 @@ 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);

2
src/main/java/geoinfo/main/login/service/LoginService.java
View File

@ -22,8 +22,6 @@ 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);

11
src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java
View File

@ -85,17 +85,6 @@ 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);

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

@ -71,26 +71,57 @@
</select>
<select id="selectConstructCompanyList" parameterType="map" resultType="egovMap">
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 IS NOT NULL
AND wmi.COMPANY_NAME NOT IN ('111', 'a')
<choose>
<when test='companyName != null and companyName.length() >= 2'>
AND CONTAINS(wmi.COMPANY_NAME, '%' || #{companyName} || '%') > 0
</when>
<otherwise>
AND 1 = 0
</otherwise>
</choose>
AND ROWNUM &lt;= 50
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.COMPANY_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.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">

21
src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
View File

@ -182,27 +182,6 @@
]]>
</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

2
src/main/webapp/js/map/main/map.js
View File

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