登录放入用户可操作的机构信息

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -183,15 +183,14 @@ public class UserServiceImpl implements UserService {
         LoginUser loginUser = (LoginUser) oAuth2Authentication.getPrincipal();
         List<ProgramItem>programItems=new ArrayList<>();
 
-        Permission permission=new Permission();
-        permission.setPermissionType(2);
-       /* permission.setRoleState(-1);
-        if(permission.getRoleState()==-1){
+        Permission permission= findPermission(user);
+        if(permission==null||(permission!=null&&permission.getRoleState()==0)){
             return null;
-        }*/
+        }
+
         getDataPermission(permission.getPermissionType(),user,programItems);
         //角色必须是ROLE_开头，其余的是用户功能权限
-        /* List<Permission> permissionList =findPermission(user);
+        /*
         Integer permissionType = permissionList.get(0).getPermissionType();
         List<ProgramItem> programItemList = newArrayList();
         //获取数据权限
@@ -257,9 +256,7 @@ public class UserServiceImpl implements UserService {
     }
     private    Map<Integer, List<Org>> getAllOrgs(String orgType,String tenantId){
         Org org=new Org();
-        if(org.equals("department")){
-            org.setOrgType(orgType);
-        }
+        org.setOrgType(orgType);
         org.setTenantId(tenantId);
         List<Org> orgs = userMapper.findOrgs(org);
         Map<Integer, List<Org>> collect = orgs.stream().
@@ -279,10 +276,13 @@ public class UserServiceImpl implements UserService {
             });
         }
     }
-    private List<Permission>findPermission(User user){
+    private Permission findPermission(User user){
         List<Permission> permissionList = userMapper.findPermission(user);
+        if(permissionList.size()==0){
+            return null;
+        }
 
-        return permissionList;
+        return permissionList.get(0);
     }
     @Override
     public boolean logOut(String token) {

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

@@ -236,17 +236,17 @@
         </where>
     </select>
     <select id="findPermission" resultType="com.huaxu.model.Permission">
-        select e.NAME,e.MENU_IMAGE overIcon,e.LINK_PATH path,e.id,e.PARENT_MENU_ID parentId
-          e.PERMISSION_FLAG permission, c.PERMISSION_TYPE ,c.id roleId,c.ROLE_STATE roleState
+        select  c.PERMISSION_TYPE ,c.id roleId,c.ROLE_STATE roleState
           from uims_user a join uims_user_role b on a.id=b.USER_ID
         join uims_role c on b.ROLE_ID= c.ID
-        join uims_role_menu d on c.ID=d.ROLE_ID
-        join uims_menu e on e.id=d.MENU_ID
+        where a.STATUS !=-1 and b.status!=-1 and c.status!=-1
+        and a.id=#{id}
     </select>
     <select id="findOrgRole" resultType="com.huaxu.model.ProgramItem">
          select d.ORG_ID orgId,a.TENANT_ID  code from uims_user a join uims_user_role b on a.id=b.USER_ID
         join uims_role c on b.ROLE_ID= c.ID
         join uims_role_org d on c.ID=d.ROLE_ID
+        where a.id=#{id}
     </select>
     <select id="findOrgs" resultType="com.huaxu.entity.Org">
         select    ID, TENANT_ID, ORG_TYPE,