yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java

@@ -69,7 +69,7 @@ public class BpmOAImprestController {
         return success(respVO);
     }
 
-    @GetMapping("/getProcessInstanceId")
+    @GetMapping("/getByProcessInstanceId")
     @Operation(summary = "获得备用金表单")
     @Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
     public CommonResult<BpmOAImprestRespVO> getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/project/ProjectMapper.java

@@ -4,12 +4,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.project.vo.ProjectPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.project.ProjectDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Objects;
-
 /**
  * 项目管理 Mapper
  *
@@ -24,16 +21,12 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
                 .eqIfPresent(ProjectDO::getType, reqVO.getType())
                 .likeIfPresent(ProjectDO::getName, reqVO.getName())
                 .eqIfPresent(ProjectDO::getResponsibleDept, reqVO.getResponsibleDept())
+                .likeIfPresent(ProjectDO::getParticipationDept, reqVO.getParticipationDept())
                 .eqIfPresent(ProjectDO::getDirectorUserId, reqVO.getDirectorUserId())
                 .betweenIfPresent(ProjectDO::getStartDate, reqVO.getStartDate())
                 .betweenIfPresent(ProjectDO::getEndDate, reqVO.getEndDate())
                 .eqIfPresent(ProjectDO::getIsLongTerm, reqVO.getIsLongTerm())
                 .eqIfPresent(ProjectDO::getStatus, reqVO.getStatus())
-                .likeLeft(ProjectDO::getParticipationDept, "-" + reqVO.getParticipationDept())
-                .or()
-                .likeRight(ProjectDO::getParticipationDept, reqVO.getParticipationDept() + "-")
-                .or()
-                .like(ProjectDO::getParticipationDept, "-" + reqVO.getParticipationDept() + "-")
                 .orderByDesc(ProjectDO::getId));
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -268,17 +268,11 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    @DataPermission(enable = false)
-    @Cacheable(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST, key = "#id")
     public List<DeptDO> getChildDept(Long id) {
 
         return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
-                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .like(DeptDO::getFlag, id)
-                .likeLeft(DeptDO::getFlag, "-" + id)
+                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
-                .or()
-                .likeRight(DeptDO::getFlag, id + "-")
-                .or()
-                .like(DeptDO::getFlag, "-" + id + "-"));
     }
 
     @Override