Merge remote-tracking branch 'origin/master'

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

@@ -72,6 +72,16 @@ public class UserController {
         Pagination<UserEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+    /**
+     * 查询
+     */
+    @ApiOperation(value = "获取当前登录用户信息")
+    @RequestMapping(value = "/findLoginUserById", method = RequestMethod.POST)
+    public  AjaxMessage<UserEntity>  findLoginUserById() {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        UserEntity userEntity = userService.findUserById(Long.valueOf(currentUser.getId()));
+        return new AjaxMessage<>(ResultStatus.OK, userEntity);
+    }
     /**
      * 查询
      */

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -175,17 +175,17 @@ public class OrgServiceImpl implements OrgService {
     public List<OrgTree> getTrees(Org org) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setTenantId(currentUser.getTenantId());
-        Set<Integer>orgIds=new HashSet<>();
+       /* Set<Integer>orgIds=new HashSet<>();
         List<ProgramItem> programItemList = currentUser.getProgramItemList();
         if(programItemList!=null){
             programItemList.forEach(programItem -> {
                 orgIds.add(programItem.getOrgId());
             });
-        }
+        }*/
 
         List<OrgTree> trees=orgMapper.selectTrees(org);
 
-        trees=getOrgTree(trees,0,1,orgIds);
+        trees=getOrgTree(trees,0,1);
 
         return trees;
     }
@@ -194,19 +194,19 @@ public class OrgServiceImpl implements OrgService {
     public List<OrgTree> getUserTrees(Org org) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setTenantId(currentUser.getTenantId());
-        Set<Integer>orgIds=new HashSet<>();
+       /* Set<Integer>orgIds=new HashSet<>();
         List<ProgramItem> programItemList = currentUser.getProgramItemList();
         if(programItemList!=null){
             programItemList.forEach(programItem -> {
                 orgIds.add(programItem.getOrgId());
             });
-        }
+        }*/
 
         List<OrgTree> trees=new ArrayList<>();
         if("company".equals(org.getOrgType())){
             if(currentUser.getDepartmentId()==null){
                 trees=orgMapper.selectTrees(org);
-                trees=getOrgTree(trees,currentUser.getCompanyId(),1,orgIds);
+                trees=getOrgTree(trees,currentUser.getCompanyId(),1);
             }else{
                 org.setId(currentUser.getCompanyId());
                 trees=orgMapper.selectTrees(org);
@@ -215,7 +215,7 @@ public class OrgServiceImpl implements OrgService {
             if(currentUser.getDepartmentId()!=null){
                 org.setOrgType("department");
                 trees=orgMapper.selectTrees(org);
-                trees=getOrgTree(trees,currentUser.getDepartmentId(),1,orgIds);
+                trees=getOrgTree(trees,currentUser.getDepartmentId(),1);
             }
 
         }
@@ -223,17 +223,17 @@ public class OrgServiceImpl implements OrgService {
         return trees;
     }
 
-    public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer level, Set<Integer> set) {
+    public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer level) {
         List<OrgTree> temList = newArrayList();
         if (list != null) {
             for (OrgTree orgTree : list) {
 
                 if (id.equals(orgTree.getParentOrgId())) {
                     //拥有权限可以显示
-                    if(!set.contains(id)){
+                   /* if(!set.contains(id)){
                         orgTree.setDisplay(true);
-                    }
-                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level,set);
+                    }*/
+                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level);
                     OrgTree temPermission = new OrgTree();
                     BeanUtils.copyProperties(orgTree, temPermission);
                     temPermission.setOrgs(chidren);