列表搜索bug修复

README.md

@@ -33,7 +33,7 @@ mvn spring-boot:run
 
 ## 默认账号
 
-密码均为 `123456a`：
+密码均为 `admin123`：
 
 | 账号 | 类型 | 说明 |
 |------|------|------|

src/main/java/com/qqflow/engine/domain/flow/controller/ProcessDefinitionController.java

@@ -68,8 +68,10 @@ public class ProcessDefinitionController {
     public Result<PageResult<ProcessDefinitionDTO>> page(
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10") Integer pageSize,
-            @RequestParam(required = false) String processName) {
-        return Result.ok(this.processDefinitionService.page(pageNum, pageSize, processName));
+            @RequestParam(required = false) String processCode,
+            @RequestParam(required = false) String processName,
+            @RequestParam(required = false) Integer status) {
+        return Result.ok(this.processDefinitionService.page(pageNum, pageSize, processCode, processName, status));
     }
 
     @PostMapping("/{id}/publish")

src/main/java/com/qqflow/engine/domain/flow/service/ProcessDefinitionService.java

@@ -16,7 +16,7 @@ public interface ProcessDefinitionService {
 
     ProcessDefinitionDTO getById(Long id);
 
-    PageResult<ProcessDefinitionDTO> page(Integer pageNum, Integer pageSize, String processName);
+    PageResult<ProcessDefinitionDTO> page(Integer pageNum, Integer pageSize, String processCode, String processName, Integer status);
 
     void publish(Long id);
 

src/main/java/com/qqflow/engine/domain/flow/service/impl/ProcessDefinitionServiceImpl.java

@@ -122,12 +122,18 @@ public class ProcessDefinitionServiceImpl implements ProcessDefinitionService {
     }
 
     @Override
-    public PageResult<ProcessDefinitionDTO> page(Integer pageNum, Integer pageSize, String processName) {
+    public PageResult<ProcessDefinitionDTO> page(Integer pageNum, Integer pageSize, String processCode, String processName, Integer status) {
         Page<ProcessDefinition> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<ProcessDefinition> wrapper = new LambdaQueryWrapper<>();
+        if (processCode != null && !processCode.isEmpty()) {
+            wrapper.like(ProcessDefinition::getProcessCode, processCode);
+        }
         if (processName != null && !processName.isEmpty()) {
             wrapper.like(ProcessDefinition::getProcessName, processName);
         }
+        if (status != null) {
+            wrapper.eq(ProcessDefinition::getStatus, status);
+        }
         wrapper.orderByDesc(ProcessDefinition::getCreateTime);
         this.processDefinitionMapper.selectPage(page, wrapper);
         List<ProcessDefinitionDTO> records = page.getRecords().stream()

src/test/java/com/qqflow/engine/domain/flow/service/ProcessDefinitionServiceTest.java

@@ -20,7 +20,7 @@ class ProcessDefinitionServiceTest {
 
     @Test
     void testPage() {
-        PageResult<ProcessDefinitionDTO> result = processDefinitionService.page(1, 10, null);
+        PageResult<ProcessDefinitionDTO> result = processDefinitionService.page(1, 10, null, null, null);
         assertNotNull(result);
     }