孙向锦 / SunvoteEducation

Commit 5b3ed25de6d355580212e3c48fdac48a3b63a354

Authored by jack
1 parent a5456137

1.bug修复

Inline Side-by-side
Showing 5 changed files with 8 additions and 5 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @5b3ed25
@@ -109,14 +109,15 @@ @@ -109,14 +109,15 @@
109 <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> 109 <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
110 </c:if> 110 </c:if>
111 <c:if test="${var.COMPLETE_COUNT == '1'}"> 111 <c:if test="${var.COMPLETE_COUNT == '1'}">
112 - <c:if test="${pd.SCHOOLID ==7}"> 112 + <c:if test="${pd.SCHOOL_ID =='7'}">
113 <a onclick="homeReport2('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a> 113 <a onclick="homeReport2('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
114 </c:if> 114 </c:if>
115 - <c:if test="${pd.SCHOOLID !=7}"> 115 + <c:if test="${pd.SCHOOL_ID !='7'}">
116 <a onclick="homeReport('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a> 116 <a onclick="homeReport('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
117 </c:if> 117 </c:if>
118 <a onclick="del('${var.HOMEWORK_ID}');" ><img src="static/images/remove.png" /></a> 118 <a onclick="del('${var.HOMEWORK_ID}');" ><img src="static/images/remove.png" /></a>
119 </c:if> 119 </c:if>
  120 + </td>
120 121
121 </tr> 122 </tr>
122 123
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
  View file @5b3ed25
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <link rel="stylesheet" href="static/css/teach.css" /> 23 <link rel="stylesheet" href="static/css/teach.css" />
24 <link rel="stylesheet" href="static/css/edit.css" /> 24 <link rel="stylesheet" href="static/css/edit.css" />
25 <style> 25 <style>
26 - .box_header{position:fixed;top:0;left:0;width:100%;} 26 + .box_header{position:fixed;top:0;left:0;width:100%;z-index:999;}
27 #Form{margin-top:102px;} 27 #Form{margin-top:102px;}
28 28
29 </style> 29 </style>
WebRoot/static/images/view.png
View file @5b3ed25

528 Bytes | W: | H:

577 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
WebRoot/static/js/teach_paper.js
  View file @5b3ed25
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 async:false, 10 async:false,
11 type:"post", 11 type:"post",
12 success:function(data){ 12 success:function(data){
13 - console.log(data); 13 + console.log(data.data.subjectList);
14 if(data!=null){ 14 if(data!=null){
15 if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){ 15 if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
16 subject_id=data.data.subjectList[0].SUBJECT_ID; 16 subject_id=data.data.subjectList[0].SUBJECT_ID;
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @5b3ed25
@@ -242,7 +242,8 @@ public class TeacherController extends BaseController { @@ -242,7 +242,8 @@ public class TeacherController extends BaseController {
242 pd = this.getPageData(); 242 pd = this.getPageData();
243 PageData n = teacherService.findById(pd); 243 PageData n = teacherService.findById(pd);
244 ResponseGson<String> ret = new ResponseGson<String>(); 244 ResponseGson<String> ret = new ResponseGson<String>();
245 - if(n.get("PASSWORD").equals(pd.get("OLDPASSWORD"))){ 245 + String oldPass = new SimpleHash("SHA-1", n.getString("ACCOUT"), pd.get("OLDPASSWORD")).toString();
  246 + if(n.get("PASSWORD").equals(oldPass)){
246 teacherService.edit(pd); 247 teacherService.edit(pd);
247 pd.put("USER_ID", pd.getString("ID")); // ID 主键 248 pd.put("USER_ID", pd.getString("ID")); // ID 主键
248 pd.put("LAST_LOGIN", ""); // 最后登录时间 249 pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -256,6 +257,7 @@ public class TeacherController extends BaseController { @@ -256,6 +257,7 @@ public class TeacherController extends BaseController {
256 new SimpleHash("SHA-1", n.getString("ACCOUT"), pd 257 new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
257 .getString("PASSWORD")).toString()); // 密码加密 258 .getString("PASSWORD")).toString()); // 密码加密
258 userService.editU(pd); // 执行保存 259 userService.editU(pd); // 执行保存
  260 + teacherService.edit(pd);
259 ret.setData("Success"); 261 ret.setData("Success");
260 }else{ 262 }else{
261 ret.set5Error(); 263 ret.set5Error();