From 893c9a5a8b69bece5283cf65c7f933be37ceccc3 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Fri, 15 Jul 2022 11:40:06 +0800
Subject: [PATCH] zh

---
 .../project0512/controller/manage/UserAccountController.java   | 3 ++-
 src/main/resources/mapper/VideoMapper.xml                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
index 722eb00..dd4eabd 100644
--- a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
@@ -83,7 +83,8 @@ public class UserAccountController {
         QueryWrapper<UserAccount> qw = new QueryWrapper<>();
         qw.eq(param.getStatus() != null, "t1.status", param.getStatus());
         qw.like(param.getName() != null, "t2.name", param.getName());
-        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.orderByDesc("updateAt", "creatAt");
         return Result.success(userAccountService.listAll(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
     }
diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml
index fb62ad9..51da7c9 100644
--- a/src/main/resources/mapper/VideoMapper.xml
+++ b/src/main/resources/mapper/VideoMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zh.project0512.mapper.UserMapper">
+<mapper namespace="com.zh.project0512.mapper.VideoMapper">
     <resultMap id="pageListMap" type="java.util.Map" autoMapping="false">
         <id property="id" column="id"/>
         <result column="url" property="url"/>