添加机构列表获取

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -20,7 +20,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                        "/user/findUserIdsByPermissonOrg",
                        "/v2/**")
                 .permitAll() //配置不需要身份认证的请求路径
-                .anyRequest().authenticated() //其他所有访问路径都需要身份认证
+                //.anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()
                 .httpBasic();
     }

user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -6,6 +6,7 @@ import com.huaxu.dto.OrgTree;
 import com.huaxu.entity.Org;
 import com.huaxu.logAdvice.LogAnnotation;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.OrgService;
@@ -144,8 +145,21 @@ public class OrgController {
     public List<Org> getAllByTenantId(){
         Org org=new Org();
         org.setStatus(1);
-        org.setTenantId(UserUtil.getCurrentUser().getTenantId());
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        org.setTenantId(currentUser.getTenantId());
+
         return orgService.selectList(org);
     }
+    @RequestMapping(value = "getAll", method = RequestMethod.POST)
+    public AjaxMessage<List<Org>> getAll(){
+        Org org=new Org();
+        org.setStatus(1);
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        org.setTenantId(currentUser.getTenantId());
+        org.setProgramItems(currentUser.getProgramItemList());
+        org.setPermissonType(currentUser.getPermissonType());
+
+        return new AjaxMessage<>(ResultStatus.OK, orgService.selectList(org)) ;
+    }
 
 }

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -267,8 +267,8 @@ public class UserController {
         return new AjaxMessage<>(ResultStatus.OK,result);
     }
     @RequestMapping(value = "/findUserList", method = RequestMethod.GET)
-    public AjaxMessage<List<UserListDto>> findUserList() {
-        List<UserListDto> userList = userService.findUserList();
+    public AjaxMessage<List<UserListDto>> findUserList(Integer type) {
+        List<UserListDto> userList = userService.findUserList(type);
         return new AjaxMessage<>(ResultStatus.OK,userList);
     }
     @RequestMapping(value = "/findUserIdsByUserIds", method = RequestMethod.POST)

user_center/src/main/java/com/huaxu/entity/Org.java

@@ -1,12 +1,14 @@
 package com.huaxu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 组织(Org)实体类
@@ -112,4 +114,6 @@ public class Org implements Serializable {
     @ApiModelProperty(value = "区域名称")
     @TableField(exist = false)
     private String areaName;
+    private List<ProgramItem> programItems;
+    private Integer permissonType;
 }

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

@@ -273,7 +273,7 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 		}
 		return userEntities;
 	}
-	public List<UserListDto> findUserList()
+	public List<UserListDto> findUserList(Integer type)
 	{
 		List<UserListDto> userListDtos = new ArrayList<>();
 		LoginUser currentUser = UserUtil.getCurrentUser();
@@ -286,41 +286,52 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 		List<UserEntity>userEntities=userMapper.findUserList(userEntity);
 		List<UserEntity>companyUser=new ArrayList<>();
 		List<UserEntity>departmentUser=new ArrayList<>();
-		userEntities.forEach(user->{
-			if(user.getDeptOrgId()!=null){
-				departmentUser.add(user);
-			}else{
-				companyUser.add(user);
+		if(type==null){
+			userEntities.forEach(user->{
+				if(user.getDeptOrgId()!=null){
+					departmentUser.add(user);
+				}else{
+					companyUser.add(user);
+				}
+			});
+			Map<Long, List<UserEntity>> companyGroup = companyUser.stream()
+					.collect(Collectors.groupingBy(d -> d.getCompanyOrgId()));
+			Map<Long, List<UserEntity>> departMentGroup = departmentUser.stream()
+					.collect(Collectors.groupingBy(d -> d.getDeptOrgId()));
+			Iterator<List<UserEntity>> companyIterator = companyGroup.values().iterator();
+			Iterator<List<UserEntity>> departmentIterator = departMentGroup.values().iterator();
+			while(companyIterator.hasNext()){
+				List<UserEntity> users = companyIterator.next();
+				UserListDto userListDto=new UserListDto();
+				UserEntity user = users.get(0);
+				userListDto.setLabel(user.getCompanyOrgName());
+				userListDto.setId(user.getCompanyOrgId());
+				userListDto.setValue(user.getCompanyOrgName());
+				userListDto.setChildren(setChildrens(users));
+				userListDtos.add(userListDto);
+
 			}
-		});
-		Map<Long, List<UserEntity>> companyGroup = companyUser.stream()
-				.collect(Collectors.groupingBy(d -> d.getCompanyOrgId()));
-		Map<Long, List<UserEntity>> departMentGroup = departmentUser.stream()
-				.collect(Collectors.groupingBy(d -> d.getDeptOrgId()));
-		Iterator<List<UserEntity>> companyIterator = companyGroup.values().iterator();
-		Iterator<List<UserEntity>> departmentIterator = departMentGroup.values().iterator();
-		while(companyIterator.hasNext()){
-			List<UserEntity> users = companyIterator.next();
-			UserListDto userListDto=new UserListDto();
-			UserEntity user = users.get(0);
-			userListDto.setLabel(user.getCompanyOrgName());
-			userListDto.setId(user.getCompanyOrgId());
-			userListDto.setValue(user.getCompanyOrgName());
-			userListDto.setChildren(setChildrens(users));
-			userListDtos.add(userListDto);
+			while(departmentIterator.hasNext()){
+				List<UserEntity> users = departmentIterator.next();
+				UserListDto userListDto=new UserListDto();
+				UserEntity user = users.get(0);
+				userListDto.setLabel(user.getDeptOrgName());
+				userListDto.setId(user.getDeptOrgId());
+				userListDto.setValue(user.getDeptOrgName());
+				userListDto.setChildren(setChildrens(users));
+				userListDtos.add(userListDto);
 
+			}
+		}else{
+			userEntities.forEach(userParam->{
+				UserListDto userInfo=new UserListDto();
+				userInfo.setLabel(userParam.getUsername());
+				userInfo.setId(userParam.getId());
+				userInfo.setValue(userParam.getUsername());
+				userListDtos.add(userInfo);
+			});
 		}
-		while(departmentIterator.hasNext()){
-			List<UserEntity> users = departmentIterator.next();
-			UserListDto userListDto=new UserListDto();
-			UserEntity user = users.get(0);
-			userListDto.setLabel(user.getDeptOrgName());
-			userListDto.setId(user.getDeptOrgId());
-			userListDto.setValue(user.getDeptOrgName());
-			userListDto.setChildren(setChildrens(users));
-			userListDtos.add(userListDto);
 
-		}
 		return userListDtos;
 	}
 	private List<UserListDto> setChildrens(List<UserEntity> users){

user_center/src/main/resources/application-dev.properties

@@ -81,6 +81,11 @@ dispath.queue=dispath
 receive.exchange.name=messageExchange
 dispath.routing.key=dipathKey
 
+ribbon.OkToRetryOnAllOperations=false
+ribbon.ReadTimeout=5000:
+ribbon.ConnectTimeout=3000
+
+
 
 # 设置 feign 客户端超时时间（OpenFeign 默认支持 ribbon）
 # 值的是建立连接所用的时间，使用与网络状态正常的情况，两端连接所用的时间

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

@@ -54,6 +54,13 @@
 
         from uims_org
         <where>
+        <if test="programItems !=null">
+            id in
+            <foreach collection="programItems" item="item" open="(" close=")" separator=",">
+                #{item.orgId}
+            </foreach>
+        </if>
+
             <if test="id != null">
                 and ID = #{id}
             </if>