fetch:数据处理

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -42,4 +42,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      */
     @Select("select * from ts_institution where parent_id not in (select id from ts_institution)")
     List<TsInstitution> selectRoot();
+
+    @Select("select * from ts_institution order by rand() limit 1")
+    TsInstitution selectRand();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -110,6 +110,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
             tsInstitution.setDisabled(true);
             tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution));
             for(TsUserVO user:tsInstitution.getUsers()){
+                if(tsInstitution.getChildren()==null){
+                    tsInstitution.setChildren(new ArrayList<>());
+                }
                 tsInstitution.getChildren().add(user);
             }
         }
@@ -149,6 +152,10 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
             tsInstitutionNode.setChildren(recursionGetInstitutionAndUser(tsInstitutionNode));
             institutionObject.add(tsInstitutionNode);
             for(TsUserVO user:tsInstitutionNode.getUsers()){
+                if(tsInstitutionNode.getChildren()==null){
+                    tsInstitutionNode.setChildren(new ArrayList<>());
+                }
+
                 tsInstitutionNode.getChildren().add(user);
             }
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/ISarMenuService.java

@@ -65,4 +65,6 @@ public interface ISarMenuService extends IService<SarMenu> {
      * @return List<Menu>
      */
     List<SarMenu> getMenuByIds(List<String> menuIds);
+
+    List<SarMenu> getSecondMenuByIds(List<String> menuIds);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java

@@ -244,6 +244,21 @@ public class SarMenuServiceImpl extends ServiceImpl<SarMenuDao, SarMenu> impleme
      */
     @Override
     public List<SarMenu> getMenuByIds(List<String> menuIds) {
+        if(menuIds!=null&&menuIds.size()>0){
+            QueryWrapper<SarMenu> sarMenuQueryWrapper=new QueryWrapper<>();
+            sarMenuQueryWrapper.in("id",menuIds);
+            return dao.selectList(sarMenuQueryWrapper);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 通过Ids查询menu
+     * @param menuIds :菜单Ids
+     * @return List<Menu>
+     */
+    @Override
+    public List<SarMenu> getSecondMenuByIds(List<String> menuIds) {
         if(menuIds!=null&&menuIds.size()>0){
             QueryWrapper<SarMenu> sarMenuQueryWrapper=new QueryWrapper<>();
             sarMenuQueryWrapper.in("id",menuIds);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java

@@ -117,7 +117,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl<SarUserPersonalM
     public void setPersonalMenu(String roleId) {
         List<String> userIds=tsUserService.getUserIdsByRoleId(roleId);
         for(String userId:userIds){
-            List<SarMenu> menus=tsUserService.getMenusByUserId(userId);
+            List<SarMenu> menus=tsUserService.getSecondMenusByUserId(userId);
             System.out.println("我的板块");
             System.out.println(menus);
             updateUserPersonalMenuForRole(menus,userId);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

@@ -3,10 +3,15 @@ package com.adc.da.slrs.sarUser.controller;
 
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarResource.entity.TsResource;
+import com.adc.da.slrs.sarUrl.dao.TsUrlDao;
+import com.adc.da.slrs.sarUser.dao.TsUserDao;
 import com.adc.da.slrs.sarUser.entity.UserPositionVO;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -32,6 +37,10 @@ import java.util.List;
 public class TsUserController extends BaseController<TsUser> {
     @Autowired
     private ITsUserService tsUserService;
+    @Autowired
+    private TsUserDao tsUserDao;
+    @Autowired
+    private TsInstitutionDao tsInstitutionDao;
 
     @ApiOperation("禁用/解禁人员")
     @PostMapping("/disable")
@@ -70,4 +79,6 @@ public class TsUserController extends BaseController<TsUser> {
         return Result.success();
     }
 
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -69,4 +69,6 @@ public interface ITsUserService extends IService<TsUser> {
      * 导入人员数据
      */
     void parseUser() throws Exception;
+
+    List<SarMenu> getSecondMenusByUserId(String userId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -242,4 +242,12 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
 
         }
     }
+
+    @Override
+    public List<SarMenu> getSecondMenusByUserId(String userId) {
+        List<String> positionIds=tsUserDao.selectPositionIds(userId);
+        List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
+        List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
+        return sarMenuService.getSecondMenuByIds(menuIds);
+    }
 }