From ce8d19132375f9c0a992645f1205c88d90be78e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 24 Apr 2021 18:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E6=8A=80=E8=83=BD=E6=A0=87=E7=AD=BE=E6=9F=A5?= =?UTF-8?q?=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmMenuExchangeController.java | 4 ++++ xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 1 + 2 files changed, 5 insertions(+) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java index 570ba828..d711c2d7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java @@ -5,6 +5,7 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenuExchange; import com.xm.core.service.XmMenuExchangeService; import com.xm.core.service.push.XmMenuPushMsgService; @@ -81,6 +82,9 @@ public class XmMenuExchangeController { Map m = new HashMap<>(); RequestUtils.transformArray(xmMenuExchange, "ids"); PageUtils.startPage(xmMenuExchange); + if( !StringUtils.hasText((String) xmMenuExchange.get("branchId"))){ + xmMenuExchange.put("branchId",LoginUtils.getCurrentUserInfo().getBranchId()); + } List> xmMenuExchangeList = xmMenuExchangeService.selectListMapByWhere(xmMenuExchange); //列出XmMenuExchange列表 PageUtils.responePage(m, xmMenuExchangeList); m.put("data",xmMenuExchangeList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index e4e586da..771ccbd6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -105,6 +105,7 @@ public class XmTaskController { public Map getTask( @RequestParam Map xmTask){ Map m = new HashMap<>(); RequestUtils.transformArray(xmTask, "ids"); + RequestUtils.transformArray(xmTask, "skillIds"); PageUtils.startPage(xmTask); List> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList);