Bladeren bron

【BUG】#268 中心领导查询车间问题

zhaomn 3 jaren geleden
bovenliggende
commit
1845122e9f

+ 28 - 24
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseStationServiceImpl.java

@@ -139,6 +139,7 @@ public class BaseStationServiceImpl implements IBaseStationService {
    */
   @Override
   public List<BaseStationVo> getDetailList(BaseStationQuery query) {
+    setBaseStationQuery(query);
     List<BaseStationVo> stations = baseStationMapper.getList(query);
     for (BaseStationVo station : stations) {
       setBaseStation(station);
@@ -156,6 +157,33 @@ public class BaseStationServiceImpl implements IBaseStationService {
    */
   @Override
   public List<BaseStation> getListByDeptId(BaseStationQuery query) {
+    setBaseStationQuery(query);
+    return baseStationMapper.getStationList(query);
+  }
+
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return baseStationMapper.listStation(query);
+  }
+
+  /**
+   * 查询车间领导ID
+   *
+   * @param deptStationId 车间ID
+   * @return 领导ID列表
+   */
+  @Override
+  public List<Long> getStationLeaderId(Long deptStationId) {
+    return baseStationMapper.getStationLeaderId(deptStationId);
+  }
+
+  private void setBaseStationQuery(BaseStationQuery query){
     SysUser user = SecurityUtils.getLoginUser().getUser();
     if (user.isAdmin()) {
       query.setDeptId(null);
@@ -183,29 +211,5 @@ public class BaseStationServiceImpl implements IBaseStationService {
         query.setDeptId(null);
       }
     }
-    return baseStationMapper.getStationList(query);
-  }
-
-  /**
-   * 查询筛选车间列表
-   *
-   * @param query 查询条件
-   * @return 车间列表
-   */
-  @Override
-  public List<JcebStationVo> listStation(JcebQueryVo query) {
-    return baseStationMapper.listStation(query);
   }
-
-  /**
-   * 查询车间领导ID
-   *
-   * @param deptStationId 车间ID
-   * @return 领导ID列表
-   */
-  @Override
-  public List<Long> getStationLeaderId(Long deptStationId) {
-    return baseStationMapper.getStationLeaderId(deptStationId);
-  }
-
 }