diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java index eb7dce1..6473846 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java @@ -18,6 +18,7 @@ public class TreeDataPermissionConfiguration { // 为garden_tree表配置基于部门的数据权限 rule.addDeptColumn("garden_tree", "dept_id"); rule.addDeptColumn("garden_oldtrees", "dept_id"); + rule.addDeptColumn("garden_emergency_task", "dept_id"); }; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 77a1b0e..7672b04 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java @@ -195,9 +195,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { public PageResult getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) { Long companyId = SecurityFrameworkUtils.getCompanyId(); //超级管理员全返回 - if(companyId != null && !companyId.equals(100L)){ - pageReqVO.setCompanyId(companyId); - } +// if(companyId != null && !companyId.equals(100L)){ +// pageReqVO.setCompanyId(companyId); +// } PageResult page = emergencyTaskMapper.selectPage(pageReqVO); List list = page.getList();