From 8b1331042f19e18a6736bf0b98edef3cb2ce1074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 17 Jun 2021 16:22:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmIterationController.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index f3e6142e..3e9ee0d5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -83,12 +83,17 @@ public class XmIterationController { String productId= (String) xmIteration.get("productId"); String adminUserid= (String) xmIteration.get("adminUserid"); String menuId= (String) xmIteration.get("menuId"); + String queryScope=(String) xmIteration.get("queryScope"); + String branchId=(String) xmIteration.get("branchId"); User user = LoginUtils.getCurrentUserInfo(); xmIteration.put("userid",user.getUserid()); - if( !(StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null + if( !( StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null || StringUtils.hasText(adminUserid) ) ){ xmIteration.put("compete",user.getUserid()); } + if("branchId".equals(queryScope)){ + xmIteration.put("branchId",user.getBranchId()); + } List> xmIterationList = xmIterationService.selectListMapByWhere(xmIteration); //列出XmIteration列表 PageUtils.responePage(m, xmIterationList); m.put("data",xmIterationList); @@ -112,12 +117,17 @@ public class XmIterationController { String productId= (String) xmIteration.get("productId"); String adminUserid= (String) xmIteration.get("adminUserid"); String menuId= (String) xmIteration.get("menuId"); + String queryScope=(String) xmIteration.get("queryScope"); + String branchId=(String) xmIteration.get("branchId"); User user = LoginUtils.getCurrentUserInfo(); xmIteration.put("userid",user.getUserid()); - if( !(StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null + if( !(StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null || StringUtils.hasText(adminUserid) ) ){ xmIteration.put("compete",user.getUserid()); } + if("branchId".equals(queryScope)){ + xmIteration.put("branchId",user.getBranchId()); + } List> xmIterationList = xmIterationService.selectListMapByWhereWithState(xmIteration); //列出XmIteration列表 PageUtils.responePage(m, xmIterationList); m.put("data",xmIterationList);