只查询运维人员

user_center/src/main/java/com/huaxu/dao/UserMapper.java

@@ -4,7 +4,6 @@ import com.huaxu.entity.UserEntity;
 import java.io.Serializable;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaxu.model.ProgramItem;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,7 +37,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     List<UserEntity> findUserIdsByOrgIdAndType(List<Integer> orgIds);
 
-    List<UserEntity> findUserList(@Param("user")UserEntity userEntity);
+    List<UserEntity> findUserList(@Param("user") UserEntity userEntity,@Param("type") Integer type);
 
     List<UserEntity> findUserListByType(@Param("user")UserEntity userEntity);
 

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -323,10 +323,10 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 		UserEntity userEntity=new UserEntity();
 		userEntity.setTenantId(currentUser.getTenantId());
 		userEntity.setProgramItems(currentUser.getProgramItemList());
-		userEntity.setUserType(3+"");
+		userEntity.setUserType(currentUser.getType());
 		//1是公司，2是公司及以下，3部门，4部门及以下，5自定义
 		userEntity.setPermissonType(currentUser.getPermissonType());
-		List<UserEntity>userEntities=userMapper.findUserList(userEntity);
+		List<UserEntity>userEntities=userMapper.findUserList(userEntity,type);
 		List<UserEntity>companyUser=new ArrayList<>();
 		List<UserEntity>departmentUser=new ArrayList<>();
 		if(type==null){

user_center/src/main/resources/mapper/UserMapper.xml

@@ -184,7 +184,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join uims_org company on a.COMPANY_ORG_ID=company.ID
             left join uims_org  department on a.DEPT_ORG_ID=department.ID
             <where>
-                a.status=1 and a.user_type = 3
+                a.status=1 and
+                <if test="type!=null">
+                    a.user_type != 9999
+                </if>
+                <if test="type==null">
+                    a.user_type = 3
+                </if>
                 <if test="user.tenantId != null  and user.tenantId != ''"> and a.tenant_id = #{user.tenantId} </if>
 
                 <if test="user.deptOrgId != null  and user.deptOrgId != ''">