From d544e340a1e569c64cb3ebfea23b3cfa901fb442 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:15:26 +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 --- .../com/xm/core/ctrl/XmTaskExecuserController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 3d43b0cb..d164b550 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 @@ -11,6 +11,7 @@ import com.mdp.meta.client.service.ItemService; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.service.remote.UserBaseInfoRemoteQueryService; import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskExecuser; @@ -65,6 +66,9 @@ public class XmTaskExecuserController { @Autowired MkClient mkClient; + + @Autowired + UserBaseInfoRemoteQueryService userBaseInfoRemoteQueryService; @Autowired @@ -174,7 +178,14 @@ public class XmTaskExecuserController { return m; } if("1".equals(xmTask.getCrowd()) && "1".equals(xmTask.getTaskOut())){ - String colUserid=StringUtils.hasText(xmTaskExecuser.getExecUserBranchId())?xmTaskExecuser.getExecUserBranchId():xmTaskExecuser.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(); + } Map result=mkClient.checkAndGetMemberInterests(colUserid,xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); Tips tips2= (Tips) result.get("tips"); if(!tips2.isOk()){