Commit ce252f1eb5435b5010fcf1d3eb3edfe88e89d0c7

Authored by 王富生
1 parent 07afb5e6

抢险任务提交update

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
@@ -18,6 +18,7 @@ public class TreeDataPermissionConfiguration { @@ -18,6 +18,7 @@ public class TreeDataPermissionConfiguration {
18 // 为garden_tree表配置基于部门的数据权限 18 // 为garden_tree表配置基于部门的数据权限
19 rule.addDeptColumn("garden_tree", "dept_id"); 19 rule.addDeptColumn("garden_tree", "dept_id");
20 rule.addDeptColumn("garden_oldtrees", "dept_id"); 20 rule.addDeptColumn("garden_oldtrees", "dept_id");
  21 + rule.addDeptColumn("garden_emergency_task", "dept_id");
21 }; 22 };
22 } 23 }
23 24
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
@@ -195,9 +195,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { @@ -195,9 +195,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
195 public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) { 195 public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) {
196 Long companyId = SecurityFrameworkUtils.getCompanyId(); 196 Long companyId = SecurityFrameworkUtils.getCompanyId();
197 //超级管理员全返回 197 //超级管理员全返回
198 - if(companyId != null && !companyId.equals(100L)){  
199 - pageReqVO.setCompanyId(companyId);  
200 - } 198 +// if(companyId != null && !companyId.equals(100L)){
  199 +// pageReqVO.setCompanyId(companyId);
  200 +// }
201 PageResult<EmergencyTaskDO> page = emergencyTaskMapper.selectPage(pageReqVO); 201 PageResult<EmergencyTaskDO> page = emergencyTaskMapper.selectPage(pageReqVO);
202 202
203 List<EmergencyTaskDO> list = page.getList(); 203 List<EmergencyTaskDO> list = page.getList();