修改工作流

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowDefinitionController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/FlowDefinition")
-@Api(tags = "流程定义")
+@Api(tags = "[工作流]流程定义")
 public class FlowDefinitionController {
     @Autowired
     private IFlowDefinitionService FlowDefinitionService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowInstanceController.java

@@ -18,7 +18,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/FlowInstance")
-@Api(tags = "流程实例")
+@Api(tags = "[工作流]流程实例")
 public class FlowInstanceController {
     @Autowired
     private IFlowInstanceService flowInstanceService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowTaskController.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/FlowTask")
-@Api(tags = "流程任务")
+@Api(tags = "[工作流]流程任务")
 public class FlowTaskController {
     @Autowired
     private IFlowTaskService FlowTaskService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @RequestMapping("/SysForm")
-@Api(tags = "流程编辑")
+@Api(tags = "[工作流]流程编辑")
 public class SysFormController {
     @Autowired
     private ISysFormService SysFormService;
@@ -45,8 +45,8 @@ public class SysFormController {
         return  ApiRes.success(SysFormService.updateFormName(process));
     }
     @ApiOperation("获取全部可用的表单和审核流")
-    @GetMapping(value = "GetFormList")
-    public ApiRes<PageResult<TemplateGroupVo>> GetFormList(BaseRequest br) {
+    @PostMapping(value = "GetFormList")
+    public ApiRes<PageResult<TemplateGroupVo>> GetFormList(@RequestBody BaseRequest br) {
         return ApiRes.success(SysFormService.getFormList(br));
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java

@@ -29,7 +29,8 @@ public class ProcessTemplates {
     @TableField(exist = false)
     private String formId;
     private String formName;
-    private String orgId;
+    @TableField(value = "org_id")
+    private Long orgId;
     @TableField(exist = false)
     private Integer groupId;
     /**

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -210,7 +210,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                             .formId(v.getTemplateId())
                             .remark(v.getRemark())
                             .formName(v.getFormName())
-                            .orgId(v.getOrgId())
+                            .orgId(String.valueOf(v.getOrgId()))
                             .isStop(v.getIsStop())
                             .updated(DateFormatUtils.format(v.getUpdated(),"yyyy年MM月dd日 HH时:mm分:ss秒"))
                             .templateId(v.getTemplateId())
@@ -278,7 +278,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
         ProcessTemplates processTemplates = ProcessTemplates.builder().build();
         String templateId = idWorker.nextId()+"";
-        processTemplates.setOrgId(req.getOrgId());
+        processTemplates.setOrgId(Long.valueOf(req.getOrgId()));
         processTemplates.setTemplateId(templateId);
         processTemplates.setFormName(req.getFormName());
         processTemplates.setRemark(req.getRemark());

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java

@@ -141,7 +141,11 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
 
     public PageResult<TemplateGroupVo> getFormList(BaseRequest br)
     {
+        Map<String, Object> params = br.getParams();
         LambdaQueryWrapper<ProcessTemplates> wrapper = new LambdaQueryWrapper<ProcessTemplates>();
+        wrapper.and(q -> q.eq(ProcessTemplates::getOrgId, params.get("orgId"))
+                .or()
+                .isNull(ProcessTemplates::getOrgId));
         wrapper.orderByDesc(ProcessTemplates::getUpdated);
         TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
         Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper);
@@ -176,6 +180,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
                             .formId(v.getTemplateId())
                             .remark(v.getRemark())
                             .formName(v.getFormName())
+                            .orgId(String.valueOf(v.getOrgId()))
                             .isStop(v.getIsStop())
                             .updated(DateFormatUtils.format(v.getUpdated(),"yyyy年MM月dd日 HH时:mm分:ss秒"))
                             .templateId(v.getTemplateId())