0719

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -9,6 +9,7 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.innerTurnover.domain.BizInnerTurnover;
 import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.domain.SysDeptUser;
 import cn.ezhizao.project.system.domain.SysRole;
@@ -94,6 +95,14 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectEmployeeList(user);
         return getDataTable(list);
     }
+    @GetMapping("/getUserList")
+    public TableDataInfo getUserList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
+        startPage();
+        String tenantId = request.getHeader("tenantId");
+        user.setTenantId(Long.valueOf(tenantId));
+        List<SysUser> list = userService.getUserList(user);
+        return getDataTable(list);
+    }
 
     /**
      * 获取中间表信息
@@ -486,7 +495,11 @@ public class SysUserController extends BaseController {
         dept.setTenantId(Long.valueOf(tenantId));
         return success(deptService.selectDeptTreeList(dept));
     }
-
+    @GetMapping("/listInnerUserByDeptId")
+    public TableDataInfo listInnerUserByDeptId(SysDept sysDept) {
+        startPage();
+       return getDataTable(deptUserService.selectInnerUserByDeptId(sysDept));
+    }
     /**
      * 根据userName获取id
      */

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -26,6 +26,7 @@ public interface SysUserMapper {
      * @return 用户信息集合信息
      */
     public List<SysUser> selectTenantList(SysUser sysUser);
+    List<SysUser> getUserList(SysUser user);
 
     /**
      * 根据条件分页查询用户列表

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -32,6 +32,7 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     List<SysUser> selectEmployeeList(SysUser user);
+    List<SysUser> getUserList(SysUser user);
 
     /**
      * 根据ids查询用户列表

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -81,6 +81,11 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.selectTenantList(user);
     }
 
+    @Override
+    public List<SysUser> getUserList(SysUser user) {
+        return userMapper.getUserList(user);
+    }
+
     /**
      * 根据条件分页查询员工列表
      *

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -193,6 +193,18 @@
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+	<select id="getUserList" resultType="cn.ezhizao.project.system.domain.SysUser">
+		select distinct * from sys_user
+		<where>
+			<if test="userName != null and userName != ''">
+				AND user_name like concat('%', #{userName}, '%')
+			</if>
+			<if test="nickName != null and nickName != ''">
+				AND nick_name like concat('%', #{nickName}, '%')
+			</if>
+			and del_flag = 0 and user_id != 1 and user_id !=2
+		</where>
+	</select>
 	<!-- 员工列表 selectEmployeeList -->
 	<select id="selectEmployeeList" parameterType="SysUser" resultMap="SysUserResult">
 		SELECT