Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

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

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

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

@@ -184,7 +184,7 @@ 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 != -9999
+                a.status=1 and a.user_type = 3
                 <if test="user.tenantId != null  and user.tenantId != ''"> and a.tenant_id = #{user.tenantId} </if>
 
                 <if test="user.deptOrgId != null  and user.deptOrgId != ''">