审批系统修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -480,6 +480,12 @@ public class ApprovalController {
         if(type == null){
             return  ResponseJson.getFAILURE();
         }
+        //获取openid,根据openid查询当前登录人信息
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        Admin currentAdmin = sysService.getByOpenid(openId);
+        if(currentAdmin == null){
+            return new ResponseJson(200, "未查询到登录人信息", 500);
+        }
         List<Object> info = approvalTaskService.findApplyRu(type);
         if(info.size() < 1){
             return  ResponseJson.getFAILURE();
@@ -502,6 +508,7 @@ public class ApprovalController {
         List<Admin> listAdmin = sysService.listAdminInfo(adminTwo);
         rj.addResponseKeyValue("list",listString);
         rj.addResponseKeyValue("warehouseAdmin",listAdmin);
+        rj.addResponseKeyValue("currentAdmin",currentAdmin);
         return rj;
     }