Merge branch 'JIWOO'

This commit is contained in:
JIWOO 2025-02-12 18:12:26 +09:00
commit e3a058e585
2 changed files with 11 additions and 3 deletions

View File

@ -185,7 +185,7 @@ public class MemberJoinController {
String[] phList = null;
if(!memberPh.equals("") && memberPh != null){
phList = memberPh.split("-");
if(phList.length >= 2){
if(phList.length >= 3){
model.addAttribute("joinPh01", phList[0]);
model.addAttribute("joinPh02", phList[1]);
model.addAttribute("joinPh03", phList[2]);
@ -196,7 +196,7 @@ public class MemberJoinController {
String[] telList = null;
if(!memberPh.equals("") && memberPh != null){
telList = memberTel.split("-");
if(telList.length >= 2){
if(telList.length >= 3){
model.addAttribute("joinTel01", telList[0]);
model.addAttribute("joinTel02", telList[1]);
model.addAttribute("joinTel03", telList[2]);

View File

@ -381,8 +381,16 @@
MEMBER_ID AS code
FROM T_MEMBER
WHERE MEMBER_STATUS = 'U'
AND MEMBER_DEPT = ${memberDept}
AND (
MEMBER_DEPT = ${memberDept}
<!-- AND (MEMBER_DEPT = ${memberDept} OR ENABLE_DEPT LIKE '%' || ${memberDept} || '%') -->
<if test='memberDept eq "1005000000" or memberDept eq "1040000000" or memberDept eq "1030000000"'><!-- 가맹유통, 유통, 플랫폼팀 -->
OR MEMBER_DEPT IN ('1005000000', '1040000000', '1030000000')
</if>
<if test='memberDept eq "1009000000" or memberDept eq "1008000000"'><!-- 대리, 약관팀 -->
OR MEMBER_DEPT IN ('1009000000', '1008000000')
</if>
)
ORDER BY MEMBER_NAME
</select>