1. 계정연동하기 > 본인계정 연동해제 하기 막기

2. 음악설정 > 플러스 버튼시 음악파일 첨부 확인되도록.
dev_bert
jonghwan76 3 years ago
parent 95c2945c12
commit 8645eefb89

@ -9,13 +9,11 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="카카오 소셜로그인 수정-">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/social_login_common.ftl" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/kakaoLogin_callback.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/kakaoLogin_callback.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/nhnLogin_callback.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/nhnLogin_callback.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -644,4 +642,15 @@
<MESSAGE value="카카오 소셜로그인 수정" />
<option name="LAST_COMMIT_MESSAGE" value="카카오 소셜로그인 수정" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java</url>
<line>179</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>

@ -205,10 +205,14 @@ public class M_Member_envController extends AbstractControllerManager{
DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
paramMap.copyFromDataMapByKeys(rm_mem, new String[]{"member_id"});
if(paramMap.get("del_member_id").equals(paramMap.get("del_member_id"))) {
result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
} else {
member_envBO.delete_member_sync(paramMap);
result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
}
}
}
} catch (Exception ex1) {
ex1.printStackTrace();
result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);

@ -36,12 +36,14 @@
return;
}.bind('this'),
success:function(result){
console.log(result)
// console.log(result);
this.is_loading = false
var RESULT = result.RESULT
if(result.RESULT == 0){
Swal.fire({text: '선택하신 계정연동 해제 되었습니다.'}).then((result)=>{ location.reload(); })
} else if(result.RESULT == 6){
Swal.fire({text: '본인 계정은 연동해제 할 수 없습니다.'}).then((result)=>{ location.reload(); })
} else {
Swal.fire({text: '선택하신 계정연동 해제 실패했습니다'})
}

@ -105,6 +105,21 @@
var muteYnIdxList = ""; //음소거 IDX 목록
var delList = $("#delList").val();
var bAddNoFile = false;
//음소거여부 yn목록
$("input[name='file']").each(function(index, item){
if( $(item).val() == "") {
bAddFile = true;
}
});
if(bAddFile) {
Swal.fire({text: '추가한 음악은 파일을 지정해야 합니다.'});
return;
}
//음소거여부 yn목록
$("input[name='mute_yn']").each(function(index, item){
muteYnList += $(item).attr("value") + ",";

Loading…
Cancel
Save