diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java index a0ff644c2f..e36f23c4f8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java @@ -21,4 +21,6 @@ public class ShareBusVehicleApplyQuery implements Query { private List members; @ApiModelProperty("部门") private List groups; + + private String userSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 94c5fd4a95..9288db77e0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -955,11 +955,20 @@ public class BusVehicleApplyService extends MybatisBaseService memberSidList = shareQuery.getMembers(); + //勾选的部门sid List orgSidList = shareQuery.getGroups(); ShareUserQuery shareUserQuery = new ShareUserQuery(); shareUserQuery.setOrgSids(orgSidList); shareUserQuery.setMemberSids(memberSidList); + //查询所勾选的人员和勾选的部门下的去重后的所有人员的用户sid ResultBean> staffList = sysUserFeign.shareSelectUser(shareUserQuery); if(memberSidList == null && orgSidList != null && orgSidList.size()>0){ if(staffList.getData() == null || staffList.getData().size() == 0){ @@ -970,43 +979,44 @@ public class BusVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); ResultBean> resultBean = flowableFeign.selectFlowVaributes(taskId); if(!resultBean.getData().isEmpty()){ appMap = (Map)resultBean.getData().get("app"); } - log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean)); - ShareUserQuery shareUserQuery1 = new ShareUserQuery(); - shareUserQuery1.setMemberSids(memberSidList); - shareUserQuery1.setOrgSids(orgSidList); - ResultBean> shareResultBean = sysUserFeign.shareSelectUser(shareUserQuery1); + log.info("分享方法查询移动端参数-resultBean:{}", JSONObject.toJSONString(resultBean)); + StringBuilder userSids = new StringBuilder(); - shareResultBean.getData().forEach(f->{ + staffList.getData().forEach(f->{ userSids.append(f).append(","); }); userSids.deleteCharAt(userSids.length() - 1); + UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); + uff.setTaskDefKey(taskDefKey); + uff.setTaskId(taskId); + uff.setProcInsId(proInstId); + uff.setProcDefId(modelId); + uff.setNodeState(nodeState); MessageFlowableQueryForCC mfq = new MessageFlowableQueryForCC(); - /*MessageFlowVo messageFlowVo = new MessageFlowVo(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); BeanUtil.copyProperties(uff, messageFlowVo); - mfq.setUfVo(messageFlowVo);*/ + mfq.setUfVo(messageFlowVo); mfq.setAppMap(appMap); mfq.setBusinessSid(busVehicleApply.getSid()); mfq.setMsgContent("分享的流程审批,请查看"); - - ResultBean stringResultBean = messageFeign.pushMessageCC(mfq); + mfq.setUserSid(shareQuery.getUserSid()); + ResultBean stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { - log.info("分享失败,同送消息异常!:{}", JSONObject.toJSONString(stringResultBean)); - return rb.setMsg("分享失败,同送消息异常!"); + log.info("分享失败,推送消息异常!:{}", JSONObject.toJSONString(stringResultBean)); + return rb.setMsg("分享失败,推送消息异常!"); } return rb.success().setMsg("分享成功!"); } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue index 882d864d22..a32a356d18 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue @@ -45,6 +45,11 @@ + + +