Merge branch 'dimengzhe'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1458,6 +1458,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             return rb.setMsg("请填写意见");
         }
         BusSalesOrder busSalesOrder = fetchBySid(query.getBusinessSid());
+        if(busSalesOrder == null){
+            FlowTaskVo flowTaskVo = new FlowTaskVo();
+            BeanUtil.copyProperties(query, flowTaskVo);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            return rb.success().setMsg("该销售订单不存在，流程已终止");
+        }else{
             String businessTaskId = busSalesOrder.getTaskId();
             if (StringUtils.isNotBlank(businessTaskId)) {
                 if(query.getUserSid().equals(busSalesOrder.getCreateBySid())){
@@ -1577,6 +1586,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
 
             }
+        }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -414,6 +414,7 @@ public class FlowableRest implements FlowableFeign {
                         }
                     }
                 }
+
             }
         }
         String comment = dto.getComment();
@@ -500,6 +501,24 @@ public class FlowableRest implements FlowableFeign {
             String id = flowElement.getId();
             if (taskDefKey.equals(id) && i + 1 < flowElements.size()) {
                 FlowElement flowElement1 = flowElements.get(i + 1);
+                FlowElement flowElement2 = flowElements.get(i + 2);
+                List<SysUserVo> sysUserVoLists2 = new ArrayList<>();
+                if (flowElement2 instanceof UserTask) {
+                    UserTask userTask = (UserTask) flowElement2;
+                    List<String> candidateGroups = userTask.getCandidateGroups();
+                    //根据角色查询用户
+                    for (String roleSid : candidateGroups) {
+                        UserQuery userQuery = new UserQuery();
+                        userQuery.setRoleSid(roleSid);
+                        userQuery.setOrgSidPath(dto.getOrgSidPath());
+                        ResultBean<List<SysUserVo>> userByRole = sysUserFeign.getUserByRole(userQuery);
+                        boolean success = userByRole.getSuccess();
+                        if (!success) {
+                            continue;
+                        }
+                        sysUserVoLists2.addAll(userByRole.getData());
+                    }
+                }
                 if (flowElement1 instanceof UserTask) {
                     UserTask userTask = (UserTask) flowElement1;
                     List<String> candidateGroups = userTask.getCandidateGroups();
@@ -523,7 +542,7 @@ public class FlowableRest implements FlowableFeign {
                         break;
                     }
                     //如果下一环节无用户，则默认系统管理员自动审批
-                    if(sysUserVoLists.size() == 0 && StringUtils.isNotBlank(nextUserSid)){
+                    if(sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)){
                         contains = true;
                         break;
                     }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -311,7 +311,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             List<FlowTask> hisFlowList = new ArrayList<>();
             for (HistoricActivityInstance histIns : list) {
                 if (StringUtils.isNotBlank(histIns.getTaskId())) {
-                    boolean isStop = false;
                     FlowTask flowTask = new FlowTask();
                     flowTask.setTaskId(histIns.getTaskId());
                     flowTask.setTaskName(histIns.getActivityName());
@@ -335,9 +334,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                         List<SysUserVo> data1 = sysUserVoResultBean.getData();
                         List<TaskUserInfo> taskUserInfos=new ArrayList<>();
                         for( SysUserVo data:data1){
-                            if("admin".equals(data.getName())){
-                                isStop = true;
-                            }
                             TaskUserInfo taskUserInfo=new TaskUserInfo();
                             taskUserInfo.setAssigneeName(data.getName());
                             taskUserInfo.setAssigneeSid(data.getSid());
@@ -348,9 +344,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                         }
                         flowTask.setTaskUserInfos(taskUserInfos);
                     }
-                    if(isStop){
-                        continue;
-                    }
 
                     // 展示审批人员
                     List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java

@@ -30,4 +30,6 @@ public class AppFlowableRecordAndCommentVo implements Vo {
     @JsonProperty("processCommentVo")
     private ProcessCommentVo processCommentVo;
 
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java

@@ -63,5 +63,4 @@ public class AppFlowableRecordVo implements Vo {
     private String procDefId;
 
     private Map<String,Object> procVars;
-
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java

@@ -19,5 +19,4 @@ public class AppUserVo implements Vo {
     @ApiModelProperty(value = "头像")
     @JsonProperty("image")
     private String assigneeHeadImage;
-
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -86,6 +86,13 @@ public class AppService {
             a.setTime(f.getFinishTime() == null ? new Date() : f.getFinishTime());
             a.setFlowableRecordVo(f);
             a.setState(0 + "");
+            List<AppUserVo> taskUserInfos = f.getTaskUserInfos();
+            if(taskUserInfos.size() == 1){
+                AppUserVo appUserVo = taskUserInfos.get(0);
+                if("admin".equals(appUserVo.getAssigneeName())){
+                    return;
+                }
+            }
             list.add(a);
         });