From 9d839553b4d63c3fef4496caedfd162520c7d871 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Wed, 3 Mar 2021 17:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yipin/liuwanr/controller/ProjectManagementController.java | 2 +-
.../java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java
index ba546be..33e4df3 100644
--- a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java
+++ b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java
@@ -161,7 +161,7 @@ public class ProjectManagementController {
@ApiParam(name = "userId", value = "用户id", required = true) @RequestParam(required = false) Integer userId,
@ApiParam(name = "pageNo", value = "第几页,页码", required = true) @RequestParam Integer pageNo,
@ApiParam(name = "pageSize", value = "每页展示的数据条数", required = true) @RequestParam Integer pageSize,
- @ApiParam(name = "projectName", value = "项目名称", required = true) @RequestParam String projectName) {
+ @ApiParam(name = "projectName", value = "项目名称", required = false) @RequestParam String projectName) {
Response resp = new Response();
ProjectManagement vo = new ProjectManagement();
if (null != systemId) {
diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index 1a82d2d..fd55c59 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -71,7 +71,8 @@ public interface ProjectManagementMapper {
"select * from hr_project_management where 1 = 1",//(roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0)",
"AND roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0",
" AND ((roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0) OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} ))",//教师端,一开始进入项目管理,看见自己创建的和其他人看见的
- " and systemId=#{systemId}",
+ " and systemId=#{systemId}",
+ " and projectName like '%' #{projectName} '%'",
" ORDER BY creationTime desc",
""})
List queryManagementsExportTest(ProjectManagement management);