add

fs-company/src/main/java/com/fs/company/controller/qw/QwDeptController.java

@@ -50,7 +50,15 @@ public class QwDeptController extends BaseController
         return getDataTable(list);
     }
 
-
+    @GetMapping("/deptList")
+    public TableDataInfo deptList(QwDept qwDept)
+    {
+        startPage();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        qwDept.setCompanyId(loginUser.getUser().getCompanyId());
+        List<QwDept> list = qwDeptService.selectCompanyDeptList(qwDept);
+        return getDataTable(list);
+    }
     /**
     * 同步企业微信 部门信息
     */

fs-company/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
 #    active: dev
 #    active: druid-jzzx-test
 #    active: druid-hdt
-    active: druid-syysy-test
+    active: dev
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft

fs-service/src/main/java/com/fs/qw/mapper/QwDeptMapper.java

@@ -3,20 +3,21 @@ package com.fs.qw.mapper;
 import com.fs.qw.domain.QwDept;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 /**
  * 企业微信部门Mapper接口
- * 
+ *
  * @author fs
  * @date 2024-08-27
  */
-public interface QwDeptMapper 
+public interface QwDeptMapper
 {
     /**
      * 查询企业微信部门
-     * 
+     *
      * @param id 企业微信部门主键
      * @return 企业微信部门
      */
@@ -24,7 +25,7 @@ public interface QwDeptMapper
 
     /**
      * 查询企业微信部门列表
-     * 
+     *
      * @param qwDept 企业微信部门
      * @return 企业微信部门集合
      */
@@ -32,7 +33,7 @@ public interface QwDeptMapper
 
     /**
      * 新增企业微信部门
-     * 
+     *
      * @param qwDept 企业微信部门
      * @return 结果
      */
@@ -44,7 +45,7 @@ public interface QwDeptMapper
 
     /**
      * 修改企业微信部门
-     * 
+     *
      * @param qwDept 企业微信部门
      * @return 结果
      */
@@ -52,7 +53,7 @@ public interface QwDeptMapper
 
     /**
      * 删除企业微信部门
-     * 
+     *
      * @param id 企业微信部门主键
      * @return 结果
      */
@@ -60,7 +61,7 @@ public interface QwDeptMapper
 
     /**
      * 批量删除企业微信部门
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -68,4 +69,13 @@ public interface QwDeptMapper
 
     @Delete("delete from qw_dept where dept_id = #{map.deptId} and company_id = #{map.companyId}")
     public int deleteQwDeptByDeptId(@Param("map") QwDept qwDept);
+    @Select("<script>" +
+            "SELECT dept_id id,dept_id,dept_name  FROM company_dept " +
+            "WHERE parent_id != 0 " +
+            "AND company_id = #{companyId} " +
+            "<if test='deptName != null and deptName != \"\"'>" +
+            "AND dept_name LIKE CONCAT('%', #{deptName}, '%')" +
+            "</if>" +
+            "</script>")
+    List<QwDept> selectCompanyDeptList(QwDept qwDept);
 }

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -435,14 +435,13 @@ public interface QwUserMapper extends BaseMapper<QwUser>
 
     @Select("<script>" +
             "select qu.id,qu.qw_user_id,qu.qw_user_name,qu.department,qu.corp_id,qu.company_id,qu.company_user_id, " +
-            "cu.nick_name, cu.user_name, qd.dept_name as departmentName from qw_user qu " +
+            "cu.nick_name, cu.user_name from qw_user qu " +
             "LEFT JOIN company_user cu ON cu.user_id=qu.company_user_id " +
-            "RIGHT JOIN qw_dept qd on qu.department=qd.dept_id and qd.corp_id=qu.corp_id " +
             "where qu.is_del=0 and qu.company_user_id is not null "+
             "            <if test=\"map.corpId != null \"> and qu.corp_id = #{map.corpId}</if>\n" +
             "            <if test=\"map.companyId != null \"> and qu.company_id = #{map.companyId}</if>\n" +
             "            <if test=\"map.deptIds != null and !map.deptIds.isEmpty() \">" +
-            "               AND qu.department IN " +
+            "               AND cu.dept_id IN " +
             "                   <foreach collection='map.deptIds' item='item' open='(' separator=',' close=')'> " +
             "                       #{item} " +
             "                   </foreach> " +

fs-service/src/main/java/com/fs/qw/service/IQwDeptService.java

@@ -69,4 +69,7 @@ public interface IQwDeptService
      * @return 结果
      */
     public int deleteQwDeptById(Long id);
+
+    List<QwDept> selectCompanyDeptList(QwDept qwDept);
+
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwDeptServiceImpl.java

@@ -129,4 +129,9 @@ public class QwDeptServiceImpl implements IQwDeptService
     {
         return qwDeptMapper.deleteQwDeptById(id);
     }
+
+    @Override
+    public List<QwDept> selectCompanyDeptList(QwDept qwDept) {
+        return qwDeptMapper.selectCompanyDeptList(qwDept);
+    }
 }