diff --git a/Dao/MyBatis/Maps/User.xml b/Dao/MyBatis/Maps/User.xml index ff4a152..abba62f 100644 --- a/Dao/MyBatis/Maps/User.xml +++ b/Dao/MyBatis/Maps/User.xml @@ -238,7 +238,7 @@ ,case when c.refcode='9' then a.ccpositionetc else c.cname end ccpositionname ,case when a.usertype=1 then '교육생' when d.authname is null then '-' else d.authname end usertypestr ,CAST(AES_DECRYPT(UNHEX(a.birthday), ) AS char) birthday - ,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.ischkatt,a.authPlatform + ,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.ischkatt,a.authplatform ,row_number() over(order by $orderby$a.username) rno ,count(a.cdt) over() pagetotalcount from users a @@ -303,13 +303,13 @@ ,asno,pasname,depart,ccposition,ccpositionetc,fgnoprofile,ccjobs ,userpno,bankname,bankno ,post,address1,address2,introhtml,status,logintime,send335time,pwcalltime,pwcallno,eastereggkey,eetime,kfcfyear,isassignuser,edus - ,isacceptmobile,uduty,slevel,jointype,birthday,snsid,di,ci,vssn,ischkatt,authPlatform,) + ,isacceptmobile,uduty,slevel,jointype,birthday,snsid,di,ci,vssn,ischkatt,authplatform,) values (#usertype#,#userkind#,#userid#,#userpass#,#username#,#usernameeng# ,gender,HEX(AES_ENCRYPT(#email#, )),#isacceptemail#,HEX(AES_ENCRYPT(#mobile#, )),HEX(AES_ENCRYPT(#telno#, )) ,#asno#,#pasname#,#depart#,#ccposition#,#ccpositionetc#,#fgnoprofile#,#ccjobs# ,HEX(AES_ENCRYPT(#userpno#, )),#bankname#,HEX(AES_ENCRYPT(#bankno#, )) ,#post#,#address1#,#address2#,#introhtml#,#status#,,null,null,null,null,null,#kfcfyear#,#isassignuser#,#edus# - ,#isacceptmobile#,#uduty#,#slevel#,#jointype#,HEX(AES_ENCRYPT(#birthday#, )),#snsid#,#di#,#ci#,#vssn#,#ischkatt#,#authPlatform#,); + ,#isacceptmobile#,#uduty#,#slevel#,#jointype#,HEX(AES_ENCRYPT(#birthday#, )),#snsid#,#di#,#ci#,#vssn#,#ischkatt#,#authplatform#,); SELECT LAST_INSERT_ID() @@ -351,7 +351,7 @@ ,status =case when #status# > 0 then #status# else status end ,ischkatt = #ischkatt# - ,authPlatform = case when #authPlatform# > 0 then #authPlatform# else authPlatform end + ,authplatform = case when #authplatform# > 0 then #authplatform# else authplatform end where userno=#userno# diff --git a/FO/Controllers/AccountController.cs b/FO/Controllers/AccountController.cs index c8b844f..cb0cb11 100644 --- a/FO/Controllers/AccountController.cs +++ b/FO/Controllers/AccountController.cs @@ -78,7 +78,7 @@ namespace NP.FO.Controllers //} //else //{ - if(string.IsNullOrEmpty(vm.User.username) || string.IsNullOrEmpty(vm.User.ci) || string.IsNullOrEmpty(vm.User.di) || vm.User.authPlatform == AuthPlatform.None) + if(string.IsNullOrEmpty(vm.User.username) || string.IsNullOrEmpty(vm.User.ci) || string.IsNullOrEmpty(vm.User.di) || vm.User.authplatform == AuthPlatform.None) { return Redirect("/Account/JoinIdVeri"); } diff --git a/FO/Views/Account/CertOk3IPIN.cshtml b/FO/Views/Account/CertOk3IPIN.cshtml index 7c34f98..6daf2f8 100644 --- a/FO/Views/Account/CertOk3IPIN.cshtml +++ b/FO/Views/Account/CertOk3IPIN.cshtml @@ -30,7 +30,7 @@ $(opener.document).find("#mform").find("#User_di").val("@(DI)"); $(opener.document).find("#mform").find("#User_ci").val("@(CI)"); $(opener.document).find("#mform").find("#User_jointype").val(0); - $(opener.document).find("#mform").find("#User_authPlatform").val("@(AuthPlatform.IPIN.GetHashCode().GetHashCode())"); + $(opener.document).find("#mform").find("#User_authplatform").val("@(AuthPlatform.IPIN.GetHashCode().GetHashCode())"); $(opener.document).find("#mform").attr("action", "/Account/Join"); $(opener.document).find("#mform").submit(); self.close(); diff --git a/FO/Views/Account/CertOk3MOBI.cshtml b/FO/Views/Account/CertOk3MOBI.cshtml index 45a430b..f87e616 100644 --- a/FO/Views/Account/CertOk3MOBI.cshtml +++ b/FO/Views/Account/CertOk3MOBI.cshtml @@ -32,7 +32,7 @@ $(opener.document).find("#mform").find("#User_ci").val("@(CI)"); $(opener.document).find("#mform").find("#intval2").val(1); $(opener.document).find("#mform").find("#User_jointype").val(0); - $(opener.document).find("#mform").find("#User_authPlatform").val("@(AuthPlatform.Mobile.GetHashCode())"); + $(opener.document).find("#mform").find("#User_authplatform").val("@(AuthPlatform.Mobile.GetHashCode())"); $(opener.document).find("#mform").attr("action", "/Account/Join"); $(opener.document).find("#mform").submit(); self.close(); diff --git a/FO/Views/Account/Join.cshtml b/FO/Views/Account/Join.cshtml index 78278bb..aa38837 100644 --- a/FO/Views/Account/Join.cshtml +++ b/FO/Views/Account/Join.cshtml @@ -50,7 +50,7 @@ else @Html.HiddenFor(w => w.intval2) @*가입유형 0:일반회원가입,1:google,2:naver,3:카카오*@ @Html.HiddenFor(w => w.User.jointype) - @Html.HiddenFor(w => w.User.authPlatform) + @Html.HiddenFor(w => w.User.authplatform) @Html.HiddenFor(w => w.IsSaveOK) @@ -59,18 +59,18 @@ else - +