Commit f3a7c35e by songyinghui

Merge branch 'feature-content2' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content2

parents 6c49d1db 2ae39b4a
...@@ -74,12 +74,7 @@ public class RightController extends WebBaseController { ...@@ -74,12 +74,7 @@ public class RightController extends WebBaseController {
} }
ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, clerkId); ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, clerkId);
if (resp.isSuccess()) { if (resp.isSuccess()) {
List<RightMenuDTO> gicMenuList = rightService.listGicMenuByMenuCode(enterpriseId, clerkId, Lists.newArrayList("content_center")); return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
Map<String, Object> result = resp.getResult();
List<RightMenuDTO> menuList = (List<RightMenuDTO>)result.get("menu");
menuList.addAll(gicMenuList);
result.put("menu",menuList);
return resultResponse(HaoBanErrCode.ERR_1, result);
} }
return resultResponse(HaoBanErrCode.ERR_OTHER, resp.getMessage()); return resultResponse(HaoBanErrCode.ERR_OTHER, resp.getMessage());
} }
......
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