From b400b79cab0f9ae64524cc77d0fa2235922bf133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8C=E4=BA=91?= <heyf@youzu.com>
Date: Wed, 22 Apr 2020 15:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=86=E9=A1=B5=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datax/admin/controller/JobGroupController.java  |  2 +-
 .../com/wugui/datax/admin/mapper/JobInfoMapper.java |  3 ++-
 .../datax/admin/service/impl/JobServiceImpl.java    |  2 +-
 .../main/resources/mybatis-mapper/JobInfoMapper.xml | 13 +++++++++++--
 .../java/com/wugui/admin/dao/JobInfoMapperTest.java |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
index 532b0f6c..84a58afb 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
@@ -137,7 +137,7 @@ public class JobGroupController {
     public ReturnT<String> remove(int id) {
 
         // valid
-        int count = jobInfoMapper.pageListCount(0, 10, id, -1, null, null, null);
+        int count = jobInfoMapper.pageListCount(0, 10, id, -1, null, null, null,null);
         if (count > 0) {
             return new ReturnT<>(500, I18nUtil.getString("jobgroup_del_limit_0"));
         }
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java
index 8537e029..aaee7279 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java
@@ -31,7 +31,8 @@ public interface JobInfoMapper {
                       @Param("triggerStatus") int triggerStatus,
                       @Param("jobDesc") String jobDesc,
                       @Param("glueType") String glueType,
-                      @Param("author") String author);
+                      @Param("authors") String[] authors,
+                      @Param("jobProjects") String[] jobProjects);
 
     List<Object> findAll();
 
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java
index e1121fab..5215b7b2 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java
@@ -60,7 +60,7 @@ public class JobServiceImpl implements JobService {
 
         // page list
         List<JobInfo> list = jobInfoMapper.pageList(start, length, jobGroup, triggerStatus, jobDesc, glueType, authors, jobProjects);
-        int list_count = jobInfoMapper.pageListCount(start, length, jobGroup, triggerStatus, jobDesc, glueType, author);
+        int list_count = jobInfoMapper.pageListCount(start, length, jobGroup, triggerStatus, jobDesc, glueType, authors, jobProjects);
 
         // package result
         Map<String, Object> maps = new HashMap<String, Object>();
diff --git a/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml b/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml
index 28abdd81..2f30e19a 100644
--- a/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml
+++ b/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml
@@ -145,8 +145,17 @@
 			<if test="glueType != null and glueType != ''">
 				AND t.glue_type like CONCAT(CONCAT('%', #{glueType}), '%')
 			</if>
-			<if test="author != null and author != ''">
-				AND t.author like CONCAT(CONCAT('%', #{author}), '%')
+			<if test="authors != null">
+				AND 1=1 AND
+				<foreach collection="authors" index="index" item="author" open="(" close=")" separator=" OR ">
+					FIND_IN_SET(#{author},t.author)
+				</foreach>
+			</if>
+			<if test="jobProjects != null">
+				AND t.job_project IN
+				<foreach collection="jobProjects" item="jobProject" index="index" open="(" close=")" separator=",">
+					#{jobProject}
+				</foreach>
 			</if>
 		</trim>
 	</select>
diff --git a/datax-admin/src/test/java/com/wugui/admin/dao/JobInfoMapperTest.java b/datax-admin/src/test/java/com/wugui/admin/dao/JobInfoMapperTest.java
index 1f549cb6..af09c6b6 100644
--- a/datax-admin/src/test/java/com/wugui/admin/dao/JobInfoMapperTest.java
+++ b/datax-admin/src/test/java/com/wugui/admin/dao/JobInfoMapperTest.java
@@ -21,7 +21,7 @@ public class JobInfoMapperTest {
 	@Test
 	public void pageList(){
 		List<JobInfo> list = jobInfoMapper.pageList(0, 20, 0, -1, null, null, null,null);
-		int list_count = jobInfoMapper.pageListCount(0, 20, 0, -1, null, null, null);
+		int list_count = jobInfoMapper.pageListCount(0, 20, 0, -1, null, null, null,null);
 		
 		System.out.println(list);
 		System.out.println(list_count);