Skip to content

platform
platform
Commit 61306bec authored by 王国存's avatar 王国存
Browse files
Options

审批-通过/驳回修改

parent 2d204b47
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 61 deletions
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @ 61306bec
...@@ -186,6 +186,7 @@ public class QuestionnaireCtrl { ...@@ -186,6 +186,7 @@ public class QuestionnaireCtrl {
return map; return map;
} }
int result; int result;
//1.通过记录id删除原有备注 //1.通过记录id删除原有备注
this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId()); this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId());
//2.添加新的备注 //2.添加新的备注
......
src/main/java/com/tiptimes/ctrl/UserCtrl.java
View file @ 61306bec
...@@ -59,73 +59,73 @@ public class UserCtrl { ...@@ -59,73 +59,73 @@ public class UserCtrl {
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
String strData = (String)data.getBody(); String strData = (String)data.getBody();
JSONObject jObject = new JSONObject(strData); JSONObject jObject = new JSONObject(strData);
// String name_base64 = jObject.getString("name"); String name_base64 = jObject.getString("name");
// String pass_base64 = jObject.getString("pass"); String pass_base64 = jObject.getString("pass");
// String name = BASE64Util.getFromBase64(name_base64); String name = BASE64Util.getFromBase64(name_base64);
// String pass = BASE64Util.getFromBase64(pass_base64); String pass = BASE64Util.getFromBase64(pass_base64);
// String pass_md5 = MD5Util.encryptByMD5(pass); String pass_md5 = MD5Util.encryptByMD5(pass);
// UserLogin userLogin = this.userSerivce.getUserLoginByUserAccount(name); UserLogin userLogin = this.userSerivce.getUserLoginByUserAccount(name);
// if (userLogin == null) { if (userLogin == null) {
// map.put("result", false); map.put("result", false);
// map.put("msg", "用户不存在！"); map.put("msg", "用户不存在！");
// return map; return map;
// } else if (!pass_md5.equals(userLogin.getUserPassword())) { } else if (!pass_md5.equals(userLogin.getUserPassword())) {
// map.put("result", false); map.put("result", false);
// map.put("msg", "密码不正确！"); map.put("msg", "密码不正确！");
// return map; return map;
// } else if (userLogin.getUserState() == 1) { } else if (userLogin.getUserState() == 1) {
// map.put("result", false); map.put("result", false);
// map.put("msg", "账户禁止登录！"); map.put("msg", "账户禁止登录！");
// return map; return map;
// } else { } else {
// if (userLogin.getAuthority() == 0) { if (userLogin.getAuthority() == 0) {
// TeamMessage teamMessage = this.teamMessageService.getTeamInformationById(userLogin.getRealID()); TeamMessage teamMessage = this.teamMessageService.getTeamInformationById(userLogin.getRealID());
// if (teamMessage.getState() != 0) { if (teamMessage.getState() != 0) {
// map.put("result", false); map.put("result", false);
// map.put("msg", "账户禁止登录！"); map.put("msg", "账户禁止登录！");
// return map; return map;
// } }
//
// teamMessage.setLoginTime(DATEUtil.getNewDateYMDHNS()); teamMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
//
// try { try {
// this.teamMessageService.updateTeamMessage(teamMessage); this.teamMessageService.updateTeamMessage(teamMessage);
// } catch (Exception var18) { } catch (Exception var18) {
// } }
// } }
//
// if (userLogin.getAuthority() == 1) { if (userLogin.getAuthority() == 1) {
// SpaceMessage spaceMessage = this.spaceMessageService.getSpaceMessageBySpaceMessageID(userLogin.getRealID()); SpaceMessage spaceMessage = this.spaceMessageService.getSpaceMessageBySpaceMessageID(userLogin.getRealID());
// if (spaceMessage != null) { if (spaceMessage != null) {
// spaceMessage.setLoginTime(DATEUtil.getNewDateYMDHNS()); spaceMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
//
// try { try {
// this.spaceMessageService.updateSpaceMessage(spaceMessage); this.spaceMessageService.updateSpaceMessage(spaceMessage);
// } catch (Exception var17) { } catch (Exception var17) {
// } }
// } }
// } }
ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
HttpSession session = attrs.getRequest().getSession(); HttpSession session = attrs.getRequest().getSession();
// session.setAttribute("userID", userLogin.getUserID()); session.setAttribute("userID", userLogin.getUserID());
// session.setAttribute("authorityID", userLogin.getAuthority()); session.setAttribute("authorityID", userLogin.getAuthority());
// session.setAttribute("realID", userLogin.getRealID()); session.setAttribute("realID", userLogin.getRealID());
// session.setAttribute("userName", userLogin.getRealName()); session.setAttribute("userName", userLogin.getRealName());
session.setAttribute("userID", "10"); // session.setAttribute("userID", "10");
session.setAttribute("authorityID", "2"); // session.setAttribute("authorityID", "1");
session.setAttribute("realID", "5"); // session.setAttribute("realID", "5");
session.setAttribute("userName", "admin"); // session.setAttribute("userName", "admin");
// try { try {
// this.integralService.saveIntegral(7, userLogin.getRealID()); this.integralService.saveIntegral(7, userLogin.getRealID());
// this.actionLoginServer.saveActionLog(userLogin.getUserID(), userLogin.getRealName(), "登录的后台系统", ""); this.actionLoginServer.saveActionLog(userLogin.getUserID(), userLogin.getRealName(), "登录的后台系统", "");
// } catch (Exception var16) { } catch (Exception var16) {
// } }
map.put("result", true); map.put("result", true);
return map; return map;
// } }
} }
@RequestMapping({"/Logout"}) @RequestMapping({"/Logout"})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment