Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/workflow/dto/MyExaminePageDto.java

@@ -60,4 +60,5 @@ public class MyExaminePageDto extends PageInput {
     private Integer status;
 
     List<String> taskIds;
+
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -37,6 +37,7 @@ import com.xjrsoft.module.form.mapper.FormTemplateMapper;
 import com.xjrsoft.module.form.service.IFormExecuteService;
 import com.xjrsoft.module.magicapi.service.IMagicApiService;
 import com.xjrsoft.module.magicapi.vo.MagicApiInfoVo;
+import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.service.IUserService;
@@ -3173,7 +3174,11 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                         .orderByDesc(WorkflowCirculated::getCreateTime)
                         .like(StrUtil.isNotBlank(dto.getTaskName()), WorkflowCirculated::getTaskName, dto.getTaskName())
                         .like(StrUtil.isNotBlank(dto.getName()), WorkflowSchema::getName, dto.getName())
-                        .like(StrUtil.isNotBlank(dto.getKeyword()), WorkflowSchema::getName, dto.getKeyword())
+                        .and(StrUtil.isNotBlank(dto.getKeyword()),wp -> wp.like(WorkflowSchema::getName, dto.getKeyword())
+                                .or()
+                                .like(WorkflowCirculated::getTaskName, dto.getKeyword())
+                                .or()
+                                .like(WorkflowCirculated::getProcessName, dto.getKeyword()))
                         .eq(StrUtil.isNotBlank(dto.getOriginator()), User::getId, dto.getOriginator())
                         .eq(StrUtil.isNotBlank(dto.getSerialNumber()), WorkflowCirculated::getSerialNumber, dto.getSerialNumber())
                         .between(ObjectUtil.isNotNull(dto.getStartTime()) && ObjectUtil.isNotNull(dto.getEndTime()), WorkflowCirculated::getCreateTime, dto.getStartTime(), dto.getEndTime())

src/main/resources/mapper/workflow/WorkflowExtraMapper.xml

@@ -28,6 +28,13 @@
                 #{taskId}
             </foreach>
         </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (t.task_name like concat('%',#{dto.keyword}, '%')
+            or t.process_name like concat('%',#{dto.keyword}, '%')
+            or t.schema_name like concat('%',#{dto.keyword}, '%')
+            or t.start_user_name like concat('%',#{dto.keyword}, '%')
+            )
+        </if>
     order by t.start_time DESC
     </select>