1126

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

@@ -71,6 +71,15 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+    //包装线添加员工已经添加的不显示
+    @GetMapping("/notHasAddList")
+    public TableDataInfo notHasAddList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
+//        String tenantId = request.getHeader("tenantId");
+//        user.setTenantId(Long.valueOf(tenantId));
+        startPage();
+        List<SysUser> list = userService.selectNotAddList(user);
+        return getDataTable(list);
+    }
     @GetMapping("/tenantList")
     public TableDataInfo tenantList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.ezhizao.common.xss.Xss;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
@@ -141,6 +142,16 @@ public class SysUser extends BaseEntity {
     private String deptName;
     private Long usageCompanyId;
     private String usageCompanyName;
+    @TableField(exist = false)
+    private List<Long> hasAddIds;
+
+    public List<Long> getHasAddIds() {
+        return hasAddIds;
+    }
+
+    public void setHasAddIds(List<Long> hasAddIds) {
+        this.hasAddIds = hasAddIds;
+    }
 
     public Long getUsageCompanyId() {
         return usageCompanyId;

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

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

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

@@ -19,6 +19,7 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     List<SysUser> selectUserList(SysUser user);
+    List<SysUser> selectNotAddList(SysUser user);
     /**
      * 根据条件分页查询用户列表
      *

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

@@ -71,6 +71,12 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
     }
+
+    @Override
+    public List<SysUser> selectNotAddList(SysUser user) {
+        return userMapper.selectNotAddList(user);
+    }
+
     /**
      * 根据条件分页查询用户列表
      *

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

@@ -91,6 +91,54 @@
 	<select id="getUserByCode" parameterType="SysUser" resultMap="SysUserResult">
 		SELECT * FROM sys_user WHERE del_flag = 0 AND user_name = #{userName}
 	</select>
+	<select id="selectNotAddList" resultMap="SysUserResult">
+		SELECT distinct u.user_id,
+		u.nick_name,
+		u.user_name,
+		u.email,
+		u.avatar,
+		u.phone_number,
+		u.sex,
+		u.status,
+		u.del_flag,
+		u.login_ip,
+		u.login_date,
+		u.create_by,
+		u.create_time,
+		u.usage_company_id,
+		u.usage_company_name,
+		u.contract_company_id,
+		u.contract_company_name,
+		u.remark FROM sys_user u left join sys_dept_user d on u.user_id = d.user_id
+		WHERE u.del_flag = '0' and d.deleted = 0 and u.user_id not in
+		(select user_id from biz_package_resource_group_detail where deleted = 0)
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="tenantId != null and tenantId != 0">
+			AND u.tenant_id = #{tenantId}
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND d.dept_id = #{deptId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name LIKE concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name LIKE concat('%', #{nickName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="userType != null and userType != ''">
+			AND u.user_type = #{userType}
+		</if>
+		<if test="phoneNumber != null and phoneNumber != ''">
+			AND u.phone_number LIKE concat('%', #{phoneNumber}, '%')
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
 
 	<!-- 用户列表 selectUserList -->
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">