From b5ddd6c373d887bde925a52f0fa2d23b1529d59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 10 May 2021 09:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8C=89=E6=9C=AC?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF=E4=BC=97=E5=8C=85?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=88=99=E6=8C=89=E5=85=A8=E5=9F=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmProjectController.java | 4 +++- xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index fddc4034..a3891b4f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -104,7 +104,9 @@ public class XmProjectController { if(StringUtils.isEmpty(xmProjectVo.getCode())) { tips.setFailureMsg("编号不能为空，请修改编号再提交"); - }else { + }else if(StringUtils.hasText(xmProjectVo.getBranchId())){ + tips.setFailureMsg("项目归属机构号不能为空"); + }else { xmProjectService.saveProject(xmProjectVo); xmProjectService.clearProject(xmProjectVo.getId()); 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 559e6fc9..b3105521 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 @@ -254,6 +254,11 @@ public class XmTaskController { Map m = new HashMap<>(); RequestUtils.transformArray(xmTask, "ids"); PageUtils.startPage(xmTask); + String taskOut= (String) xmTask.get("taskOut"); + if(!"1".equals(taskOut)){ + User user = LoginUtils.getCurrentUserInfo(); + xmTask.put("branchId",user.getBranchId()); + } List> xmTaskList = xmTaskService.selectListMapByWhere(xmTask); //列出XmTask列表 PageUtils.responePage(m, xmTaskList); m.put("data",xmTaskList);