Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.SysConstants;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -837,4 +836,15 @@ public class SysUserController extends BaseController {
         }
 
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/11 16:04
+     *  @Description: 查询的所有的后线人员
+     */
+    @ApiOperation(value = "后线用户查询不分页（编辑时查询领导人）")
+    @GetMapping(value = "/findHxUserList")
+    public HttpResult findHxUserList() {
+        return HttpResult.ok(sysUserService.findHxUserList());
+    }
 }

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -386,6 +386,13 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *  @Description:  查询该机构下的代理人
      */
     List<SysUser> findQXDLUserList(@Param("deptId") String deptId, @Param("type") String type);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/11 16:09
+     *  @Description:  查询所有的后线人员
+     */
+    List<SysUser> findHxUserList();
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -185,6 +185,13 @@ public interface SysUserService extends IService<SysUser> {
      * @return
      */
     List<SysUser> getByIds(List<String> userIds);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/11 16:08
+     *  @Description: 查询所有的后线人员
+     */
+    List<SysUser> findHxUserList();
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1452,6 +1452,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserLambdaQueryWrapper.in(SysUser::getId, userIds);
         return sysUserMapper.selectList(sysUserLambdaQueryWrapper);
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/11 16:08
+     *  @Description:  查询所有的后线人员
+     */
+    @Override
+    public List<SysUser> findHxUserList() {
+        return sysUserMapper.findHxUserList();
+    }
 }
 
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1247,4 +1247,23 @@
         GROUP BY
             su.leader_name
     </select>
+
+    <select id="findHxUserList" resultType="com.ydtech.modules.admin.model.SysUser">
+        SELECT
+        t1.id AS id,
+        t1.NAME AS NAME,
+        t1.mobile AS mobile,
+        t1.`status` AS `status`,
+        t2.id AS deptId,
+        t2.`name` AS deptName,
+        sd2.id AS pDeptId,
+        sd2.`name` AS pDeptName
+        FROM
+        sys_user t1
+        LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
+        WHERE
+        t1.`status` = 1
+        AND t1.id NOT LIKE '%M%'
+    </select>
 </mapper>