Commit 58ded23ce3ff4d04cfad3e0fa8ebd46ea93421a6
1 parent
fc50ee6f
更换获取部门信息接口
Showing
3 changed files
with
4 additions
and
1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java
| @@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; | @@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; | ||
| 5 | import com.zteits.urbanops.framework.common.pojo.PageParam; | 5 | import com.zteits.urbanops.framework.common.pojo.PageParam; |
| 6 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 6 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 7 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 7 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 8 | +import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission; | ||
| 8 | import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils; | 9 | import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils; |
| 9 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; | 10 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; |
| 10 | import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; | 11 | import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; |
| @@ -40,6 +41,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA | @@ -40,6 +41,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA | ||
| 40 | @RequestMapping("/garden/inspection-plan") | 41 | @RequestMapping("/garden/inspection-plan") |
| 41 | @Validated | 42 | @Validated |
| 42 | @Slf4j | 43 | @Slf4j |
| 44 | +@DataPermission(enable = false) | ||
| 43 | public class InspectionPlanController { | 45 | public class InspectionPlanController { |
| 44 | 46 | ||
| 45 | @Resource | 47 | @Resource |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
| @@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; | @@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; | ||
| 5 | import com.zteits.urbanops.framework.common.pojo.PageParam; | 5 | import com.zteits.urbanops.framework.common.pojo.PageParam; |
| 6 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 6 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 7 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 7 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 8 | +import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission; | ||
| 8 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; | 9 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; |
| 9 | import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; | 10 | import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; |
| 10 | import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO; | 11 | import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO; |
| @@ -39,6 +40,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA | @@ -39,6 +40,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA | ||
| 39 | @RequestMapping("/garden/maintain-plan") | 40 | @RequestMapping("/garden/maintain-plan") |
| 40 | @Validated | 41 | @Validated |
| 41 | @Slf4j | 42 | @Slf4j |
| 43 | +@DataPermission(enable = false) | ||
| 42 | public class MaintainPlanController { | 44 | public class MaintainPlanController { |
| 43 | 45 | ||
| 44 | @Resource | 46 | @Resource |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
| @@ -282,7 +282,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { | @@ -282,7 +282,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { | ||
| 282 | return inspectionPlanMapper.selectById(id); | 282 | return inspectionPlanMapper.selectById(id); |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | - @DataPermission(enable = false) | ||
| 286 | @Override | 285 | @Override |
| 287 | public PageResult<InspectionPlanRespVO> getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) { | 286 | public PageResult<InspectionPlanRespVO> getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) { |
| 288 | 287 |