diff --git a/src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java b/src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java index fe8866b6..f2d71389 100644 --- a/src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java +++ b/src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.corpsystem; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -79,6 +81,7 @@ public class CorpRoleController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add()throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -104,6 +107,7 @@ public class CorpRoleController extends BaseController { } corpRoleService.add(pd); FHLOG.save(Jurisdiction.getUsername(), "新增角色"+pd.getString("ROLE_NAME")); //记录日志 + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -131,6 +135,7 @@ public class CorpRoleController extends BaseController { */ @RequestMapping(value="/edit") @ResponseBody + @DockAnnotation public Object edit()throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -138,6 +143,7 @@ public class CorpRoleController extends BaseController { pd = this.getPageData(); corpRoleService.edit(pd); FHLOG.save(Jurisdiction.getUsername(), "修改角色"+pd.getString("ROLE_NAME")); //记录日志 + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -149,6 +155,7 @@ public class CorpRoleController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object deleteRole(@RequestParam String ROLE_ID)throws Exception{ Map map = new HashMap(); PageData pd = new PageData(); @@ -170,6 +177,7 @@ public class CorpRoleController extends BaseController { errInfo = "success"; FHLOG.save(Jurisdiction.getUsername(), "删除角色ID为:"+ROLE_ID); //记录日志 } + map.put("dockData", JSON.toJSONString(pd)); } map.put("result", errInfo); return map; @@ -216,6 +224,7 @@ public class CorpRoleController extends BaseController { */ @RequestMapping(value="/saveMenuqx") @ResponseBody + @DockAnnotation(isAdd = true) public Object saveMenuqx(@RequestParam String ROLE_ID,@RequestParam String menuIds)throws Exception{ Map map = new HashMap(); PageData pd = new PageData(); @@ -237,6 +246,7 @@ public class CorpRoleController extends BaseController { corpRoleService.setAllRights(pd); //更新此角色所有子角色的菜单权限 } map.put("result", "success"); + map.put("dockData", JSON.toJSONString(pd)); FHLOG.save(Jurisdiction.getUsername(), "给角色ID:"+ROLE_ID+" 授权了菜单权限操作"); //记录日志 return map; } @@ -281,6 +291,7 @@ public class CorpRoleController extends BaseController { */ @RequestMapping(value="/saveB4Button") @ResponseBody + @DockAnnotation(isAdd = true) public Object saveB4Button(@RequestParam String ROLE_ID,@RequestParam String menuIds,@RequestParam String msg)throws Exception{ Map map = new HashMap(); PageData pd = new PageData(); @@ -294,7 +305,8 @@ public class CorpRoleController extends BaseController { pd.put("ROLE_ID", ROLE_ID); corpRoleService.saveB4Button(msg,pd); map.put("result", "success"); - FHLOG.save(Jurisdiction.getUsername(), "给角色ID:"+ROLE_ID+" 授权了增删改查按钮权限操作"); //记录日志 +// FHLOG.save(Jurisdiction.getUsername(), "给角色ID:"+ROLE_ID+" 授权了增删改查按钮权限操作"); //记录日志 + map.put("dockData", JSON.toJSONString(pd)); return map; }