审批-通过/驳回修改

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -186,6 +186,7 @@ public class QuestionnaireCtrl {
             return map;
         }
         int result;
+
         //1.通过记录id删除原有备注
         this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId());
         //2.添加新的备注

src/main/java/com/tiptimes/ctrl/UserCtrl.java

@@ -59,73 +59,73 @@ public class UserCtrl {
         Map<String, Object> map = new HashMap();
         String strData = (String)data.getBody();
         JSONObject jObject = new JSONObject(strData);
-//        String name_base64 = jObject.getString("name");
-//        String pass_base64 = jObject.getString("pass");
-//        String name = BASE64Util.getFromBase64(name_base64);
-//        String pass = BASE64Util.getFromBase64(pass_base64);
-//        String pass_md5 = MD5Util.encryptByMD5(pass);
-//        UserLogin userLogin = this.userSerivce.getUserLoginByUserAccount(name);
-//        if (userLogin == null) {
-//            map.put("result", false);
-//            map.put("msg", "用户不存在！");
-//            return map;
-//        } else if (!pass_md5.equals(userLogin.getUserPassword())) {
-//            map.put("result", false);
-//            map.put("msg", "密码不正确！");
-//            return map;
-//        } else if (userLogin.getUserState() == 1) {
-//            map.put("result", false);
-//            map.put("msg", "账户禁止登录！");
-//            return map;
-//        } else {
-//            if (userLogin.getAuthority() == 0) {
-//                TeamMessage teamMessage = this.teamMessageService.getTeamInformationById(userLogin.getRealID());
-//                if (teamMessage.getState() != 0) {
-//                    map.put("result", false);
-//                    map.put("msg", "账户禁止登录！");
-//                    return map;
-//                }
-//
-//                teamMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
-//
-//                try {
-//                    this.teamMessageService.updateTeamMessage(teamMessage);
-//                } catch (Exception var18) {
-//                }
-//            }
-//
-//            if (userLogin.getAuthority() == 1) {
-//                SpaceMessage spaceMessage = this.spaceMessageService.getSpaceMessageBySpaceMessageID(userLogin.getRealID());
-//                if (spaceMessage != null) {
-//                    spaceMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
-//
-//                    try {
-//                        this.spaceMessageService.updateSpaceMessage(spaceMessage);
-//                    } catch (Exception var17) {
-//                    }
-//                }
-//            }
+        String name_base64 = jObject.getString("name");
+        String pass_base64 = jObject.getString("pass");
+        String name = BASE64Util.getFromBase64(name_base64);
+        String pass = BASE64Util.getFromBase64(pass_base64);
+        String pass_md5 = MD5Util.encryptByMD5(pass);
+        UserLogin userLogin = this.userSerivce.getUserLoginByUserAccount(name);
+        if (userLogin == null) {
+            map.put("result", false);
+            map.put("msg", "用户不存在！");
+            return map;
+        } else if (!pass_md5.equals(userLogin.getUserPassword())) {
+            map.put("result", false);
+            map.put("msg", "密码不正确！");
+            return map;
+        } else if (userLogin.getUserState() == 1) {
+            map.put("result", false);
+            map.put("msg", "账户禁止登录！");
+            return map;
+        } else {
+            if (userLogin.getAuthority() == 0) {
+                TeamMessage teamMessage = this.teamMessageService.getTeamInformationById(userLogin.getRealID());
+                if (teamMessage.getState() != 0) {
+                    map.put("result", false);
+                    map.put("msg", "账户禁止登录！");
+                    return map;
+                }
+
+                teamMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
+
+                try {
+                    this.teamMessageService.updateTeamMessage(teamMessage);
+                } catch (Exception var18) {
+                }
+            }
+
+            if (userLogin.getAuthority() == 1) {
+                SpaceMessage spaceMessage = this.spaceMessageService.getSpaceMessageBySpaceMessageID(userLogin.getRealID());
+                if (spaceMessage != null) {
+                    spaceMessage.setLoginTime(DATEUtil.getNewDateYMDHNS());
+
+                    try {
+                        this.spaceMessageService.updateSpaceMessage(spaceMessage);
+                    } catch (Exception var17) {
+                    }
+                }
+            }
 
             ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
             HttpSession session = attrs.getRequest().getSession();
-//            session.setAttribute("userID", userLogin.getUserID());
-//            session.setAttribute("authorityID", userLogin.getAuthority());
-//            session.setAttribute("realID", userLogin.getRealID());
-//            session.setAttribute("userName", userLogin.getRealName());
-            session.setAttribute("userID", "10");
-            session.setAttribute("authorityID", "2");
-            session.setAttribute("realID", "5");
-            session.setAttribute("userName", "admin");
-
-//            try {
-//                this.integralService.saveIntegral(7, userLogin.getRealID());
-//                this.actionLoginServer.saveActionLog(userLogin.getUserID(), userLogin.getRealName(), "登录的后台系统", "");
-//            } catch (Exception var16) {
-//            }
+            session.setAttribute("userID", userLogin.getUserID());
+            session.setAttribute("authorityID", userLogin.getAuthority());
+            session.setAttribute("realID", userLogin.getRealID());
+            session.setAttribute("userName", userLogin.getRealName());
+//            session.setAttribute("userID", "10");
+//            session.setAttribute("authorityID", "1");
+//            session.setAttribute("realID", "5");
+//            session.setAttribute("userName", "admin");
+
+            try {
+                this.integralService.saveIntegral(7, userLogin.getRealID());
+                this.actionLoginServer.saveActionLog(userLogin.getUserID(), userLogin.getRealName(), "登录的后台系统", "");
+            } catch (Exception var16) {
+            }
 
             map.put("result", true);
             return map;
-//        }
+        }
     }
 
     @RequestMapping({"/Logout"})