From d990128eedb8e58ace817e372334111d4773e12b Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Fri, 15 Jul 2022 10:44:32 +0800
Subject: [PATCH] zh

---
 .../zh/project0512/controller/manage/VideoController.java  | 3 ++-
 src/main/java/com/zh/project0512/mapper/TaskMapper.java    | 7 +++++--
 src/main/java/com/zh/project0512/mapper/VideoMapper.java   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
index 353e9c6..6683c53 100644
--- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
@@ -100,7 +100,8 @@ public class VideoController {
         QueryWrapper<Video> qw = new QueryWrapper<>();
         qw.eq("t1.status", param.getStatus());
         qw.like(param.getProviderName() != null, "t2.name", param.getProviderName());
-        qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId());
+//        qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId());
+        qw.inSql(param.getDepartmentId() != null,"t2.openid","SELECT openid from qywxDepartmentUserLink WHERE qywxDepartmentUserLink.departmentId = "+param.getDepartmentId());
         qw.like(param.getTaskTitle() != null, "t4.title", param.getTaskTitle());
         qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime());
         qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime());
diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
index 46fa80f..2107e21 100644
--- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
@@ -43,8 +43,11 @@ public interface TaskMapper extends BaseMapper<Task> {
 
         "<if test='openid!=null'>" +
         "and IF((SELECT count(*)!=0 FROM taskDepartment WHERE taskId = t1.id)>0," +
-        "t1.id in (SELECT taskId from taskDepartment inner JOIN user on user.openid =#{openid} " +
-        "and user.main_department = taskDepartment.departmentId), " +
+        "t1.id in " +
+//        "(SELECT taskId from taskDepartment inner JOIN user on user.openid =#{openid} " +
+//        "and user.main_department = taskDepartment.departmentId), " +
+        "(SELECT taskId from taskDepartment WHERE departmentId in "+
+        "(SELECT departmentId from qywxDepartmentUserLink WHERE openid = #{openid}) GROUP BY taskId),"+
         " 1=1)" +
         "</if>" +
 
diff --git a/src/main/java/com/zh/project0512/mapper/VideoMapper.java b/src/main/java/com/zh/project0512/mapper/VideoMapper.java
index ac2d276..ff131e5 100644
--- a/src/main/java/com/zh/project0512/mapper/VideoMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/VideoMapper.java
@@ -35,7 +35,7 @@ public interface VideoMapper extends BaseMapper<Video> {
     @Update("update video INNER JOIN task on task.id = video.taskId and taskId = #{taskId} set video.status = 1 WHERE video.status = 0 ")
     void updStatusByTaskId(int taskId, LocalDateTime endTime);
 
-    @Select("SELECT t1.*,t2.name as providerName,t3.name as departmentName,t4.title as taskTitle,t5.account,t5.name as accountName,t5.tel as accountTel,t5.validImg as accountImg \n" +
+    @Select("SELECT t1.*,t2.name as providerName,t3.departmentId as departmentId,t3.name as departmentName,t4.title as taskTitle,t5.account,t5.name as accountName,t5.tel as accountTel,t5.validImg as accountImg \n" +
         "  from video as t1\n" +
         "LEFT JOIN user as t2 on t2.id = t1.userId\n" +
         "LEFT JOIN qywxDepartment as t3 on t3.departmentId = t2.main_department\n" +