diff --git a/BO/Views/Shared/Partial/MobileChk.cshtml b/BO/Views/Shared/Partial/MobileChk.cshtml
index dc682d0..b8b4678 100644
--- a/BO/Views/Shared/Partial/MobileChk.cshtml
+++ b/BO/Views/Shared/Partial/MobileChk.cshtml
@@ -119,6 +119,6 @@
focus("mobile_lakey");
return;
}
- capp("/aocommon/chklakey", { lakey: $("#mobile_lakey").val(), authno: authno }, "@( )");
+ capp("/aocommon/chklakey", { lakey: $("#mobile_lakey").val(), authno: authno }, "@(_method)");
}
\ No newline at end of file
diff --git a/BO/Web.config b/BO/Web.config
index c55e7fe..5c83003 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -56,9 +56,9 @@
-
+
-
+
diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index 336d1cb..446534c 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -513,20 +513,27 @@ namespace NP.Base.Controllers
var cancelcount = 0;
foreach (var lect in lects)
{
- var ispass = Dao.Get("grade.ispass", new Hashtable() { { "lectno", lect.lectno } }).FirstOrDefault().ispass;
- if (ispass == 1)
+ try
{
- if (lect.iscomplete == 0)
+ var ispass = Dao.Get("grade.ispass", new Hashtable() { { "lectno", lect.lectno } }).FirstOrDefault().ispass;
+ if (ispass == 1)
{
- completecount += Dao.Save("grade.lectcomplete2", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } });
+ if (lect.iscomplete == 0)
+ {
+ completecount += Dao.Save("grade.lectcomplete2", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } });
+ }
+ }
+ else
+ {
+ if (lect.iscomplete == 1)
+ {
+ cancelcount += Dao.Save("grade.lectcomplete.cancel", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } });
+ }
}
}
- else
+ catch
{
- if (lect.iscomplete == 1)
- {
- cancelcount += Dao.Save("grade.lectcomplete.cancel", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } });
- }
+
}
}
return JsonBack(new JsonRtn() { code = 1000, msg = "OK", obj = new { completecount , cancelcount } });
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 3a38cc1..b4991a9 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -66,8 +66,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#
@@ -97,8 +97,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#
@@ -128,8 +128,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#
@@ -159,8 +159,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#
@@ -190,8 +190,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#
@@ -221,8 +221,8 @@
and b.attrate <= #attrateunder#
and b.isrebate=#isrebate#
and b.lectno in ($lectnos$)
- inner join users c on c.userno=b.userno and c.status=1
- and c.userid=#userid#
+ inner join users c on c.userno=b.userno and c.status < 99
+ and c.userid=#userid#
and c.username=#username#
where a.ismaster=0
and a.cgno=#cgno#