فهرست منبع

工作流完善

wangwei 7 سال پیش
والد
کامیت
61c7c6447c

+ 1 - 0
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableUtilsController.java

@@ -72,6 +72,7 @@ public class FlowableUtilsController {
                 actDefEntity.setActId(map.get("act_id").toString());
                 actDefEntity.setActId(map.get("act_id").toString());
                 actDefEntity.setFormId(map.get("form_id").toString());
                 actDefEntity.setFormId(map.get("form_id").toString());
                 actDefEntity.setDefId(map.get("def_id").toString());
                 actDefEntity.setDefId(map.get("def_id").toString());
+                actDefEntity.setType(map.get("type").toString());
                 actDefService.saveOrUpdate(actDefEntity);
                 actDefService.saveOrUpdate(actDefEntity);
             }
             }
             return ResponseMessage.ok("保存成功");
             return ResponseMessage.ok("保存成功");

+ 1 - 1
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/service/imp/BpmTaskServiceImp.java

@@ -266,7 +266,7 @@ public class BpmTaskServiceImp extends FlowableAbstract implements BpmTaskServic
 //            RelationDefineEntity relationDefineEntity = relationDefineService.selectByPk(actDefEntity.getDefId());
 //            RelationDefineEntity relationDefineEntity = relationDefineService.selectByPk(actDefEntity.getDefId());
             // 获取人员信息
             // 获取人员信息
             List<Relation> relations = relationInfoService
             List<Relation> relations = relationInfoService
-                    .getRelations("person",userId)
+                    .getRelations(actDefEntity.getType(),userId)
                     .findPos(actDefEntity.getDefId());
                     .findPos(actDefEntity.getDefId());
             // 设置待办人
             // 设置待办人
             for(Relation relation : relations){
             for(Relation relation : relations){