增加机构过滤条件

operation_manager/src/main/java/com/huaxu/process/controller/WorkFlowController.java

@@ -64,6 +64,8 @@ public class WorkFlowController {
     @GetMapping("/getPage")
     @ApiOperation(value = "流程查询(分页)")
     public AjaxMessage<Pagination<ProcessDefinitionDTO>> queryProcessDefinition(
+            @ApiParam(value = "公司id", required = false) @RequestParam(required = false) Integer companyId,
+
             @ApiParam(value = "流程名称", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
@@ -71,6 +73,8 @@ public class WorkFlowController {
 
         IPage<ProcessDefinitionDTO> iPage = new Page<>(pageNum, pageSize);
         ProcessDefinition processDefinition=new ProcessDefinition();
+        processDefinition.setProcessName(name);
+        processDefinition.setCompanyOrgId(companyId);
         iPage = workFlowService.selectPage(processDefinition, iPage);
         Pagination<ProcessDefinitionDTO> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

operation_manager/src/main/java/com/huaxu/process/entity/ProcessDefinition.java

@@ -1,6 +1,7 @@
 package com.huaxu.process.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -127,6 +128,7 @@ public class ProcessDefinition implements Serializable {
      */
     @ApiModelProperty(value = "更新时间",hidden = true)
     private Date dateUpdate;
+    private List<ProgramItem> programItems;
     @ApiModelProperty(value = "公司ids")
     private List<Integer>companyIds;
 }

operation_manager/src/main/java/com/huaxu/process/service/impl/WorkFlowServiceImpl.java

@@ -149,6 +149,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
     public IPage<ProcessDefinitionDTO> selectPage(ProcessDefinition processDefinition, IPage<ProcessDefinitionDTO> iPage) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         processDefinition.setTenantId(loginUser.getTenantId());
+        processDefinition.setProgramItems(loginUser.getProgramItemList());
         //processDefinition.setCompanyOrgId(loginUser.getCompanyId());
         IPage<ProcessDefinitionDTO> processDefinitionDTOIPage = processDefinitionMapper.selectPage(iPage, processDefinition);
         return processDefinitionDTOIPage;
@@ -196,6 +197,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
 
 
         processDefinition.setUpdateBy(UserUtil.getCurrentUser().getUsername());
+        processDefinition.setProcessStatus("3");
         int result = processDefinitionMapper.update(processDefinition);
         log.info("end edit ProcessDefinition result=" + result);
     }
@@ -252,7 +254,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
         }
         processDef.setId(processId);
         processDef.setBpmnContent(content);
-        processDef.setProcessStatus("1"); // 保存流程草稿状态
+        processDef.setProcessStatus("3"); // 保存流程草稿状态
         ProcessDefinition processDefTemp = processDefinitionMapper.selectById(processId);
         processDef.setVersion(processDefTemp.getVersion() + 1);//更新版本号
         int result = processDefinitionMapper.update(processDef);

operation_manager/src/main/resources/mapper/ProcessDefinitionMapper.xml

@@ -242,11 +242,17 @@
         from sc_process_definition
         <where>
             status =1
+            <if test="processDefinition.programItems !=null">
+               and company_org_id in
+                <foreach collection="processDefinition.programItems" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+            </if>
             <if test="processDefinition.id != null">
                 and id = #{processDefinition.id}
             </if>
             <if test="processDefinition.processName != null and processDefinition.processName != ''">
-                and process_name = #{processDefinition.processName}
+                and process_name like CONCAT('%',#{processDefinition.processName},'%')
             </if>
             <if test="processDefinition.processKey != null and processDefinition.processKey != ''">
                 and process_key = #{processDefinition.processKey}