diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java index be98727..120c903 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.bridges.enums.MaintenanceExportEnum; @@ -74,9 +75,10 @@ String startDate, String endDate) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); - List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); - query.in("deptid", deptIds); - + DataScope dataScope = permissionService.getCurrUserDataScope(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { + query.in("deptid", dataScope.getDeptIds()); + } // if (ToolUtil.isNotEmpty(type)) { // query.eq("type", type); // }