From 3f85eef0dbd757356127490c0bcd278caa3c36f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 26 Apr 2022 03:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmTaskExecuserController.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 22bbc337..0e33b3d2 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -177,16 +177,20 @@ public class XmTaskExecuserController { m.put("tips", tips); return m; } - if("1".equals(xmTask.getCrowd()) && "1".equals(xmTask.getTaskOut())){ - String colUserid=user.getBranchId(); - if(!xmTaskExecuser.getUserid().equals(user.getUserid())){ - User userDb=userBaseInfoRemoteQueryService.getUserByUserid(xmTaskExecuser.getUserid(),map()); - if(userDb==null){ - return ResponseHelper.failed("userid-0","候选人不存在"); - } - colUserid=userDb.getBranchId(); - xmTaskExecuser.setExecUserBranchId(userDb.getUserid()); + String colUserid=user.getBranchId(); + if(!xmTaskExecuser.getUserid().equals(user.getUserid())){ + User userDb=userBaseInfoRemoteQueryService.getUserByUserid(xmTaskExecuser.getUserid(),map()); + if(userDb==null){ + return ResponseHelper.failed("userid-0","候选人不存在"); } + colUserid=userDb.getBranchId(); + xmTaskExecuser.setExecUserBranchId(userDb.getBranchId()); + }else{ + xmTaskExecuser.setExecUserBranchId(user.getBranchId()); + } + if("1".equals(xmTask.getCrowd()) && "1".equals(xmTask.getTaskOut())){ + + Map result=mkClient.checkAndGetMemberInterests(colUserid,xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); Tips tips2= (Tips) result.get("tips"); if(!tips2.isOk()){