From 775524110885e27fe860be1feb156ca78b5040b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 14:10:57 +0800
Subject: [PATCH] 电子围栏分页查询修改提交
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
index df2bd20..523ac98 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
@@ -193,11 +193,12 @@
@PostMapping("/wellList")
@ApiOperation("鏌ヨ鏉冮檺涓嬫墍鏈夊叴瓒ｇ偣")
public Results wellList() {
- String usersId = SecurityUtils.getUserId();
+ /*String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
//鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
- List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());*/
+ List<Long> deptList = sysDeptService.selectDeptIdBySubAndUserId(SecurityUtils.getDeptId(),SecurityUtils.getUserId());
//鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.wellList(deptList);
return Results.succeed(list);
@@ -206,11 +207,12 @@
@PostMapping("/conditionList")
@ApiOperation("鏌ョ湅閮ㄩ棬涓嬬瓫閫夋潯浠剁殑鍏磋叮鐐�")
public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam) {
- String usersId = SecurityUtils.getUserId();
+ /*String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
//鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
- List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());*/
+ List<Long> deptList = sysDeptService.selectDeptIdBySubAndUserId(SecurityUtils.getDeptId(),SecurityUtils.getUserId());
ardAlarmpointsWellParam.setDeptList(deptList);
//鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
@@ -243,7 +245,7 @@
return AjaxResult.success(result);
}
- @GetMapping("/getWellDataByPatrolplanIdAndPosition")
+ @PostMapping("/getWellDataByPatrolplanIdAndPosition")
@ApiOperation("鏌ヨ鏈�杩戝贰妫�璁惧鍔ㄩ潤鎬佸睘鎬�")
public AjaxResult getWellDataByPatrolplanIdAndPosition(@RequestBody Map<String,Object> para){
SysConfig config = new SysConfig();
@@ -253,7 +255,7 @@
return AjaxResult.success(result);
}
- @GetMapping("/getWellById")
+ @PostMapping("/getWellById")
@ApiOperation("鏍规嵁鏌ヨ鍏磋叮鐐瑰熀鏈睘鎬�")
public AjaxResult getWellById(@RequestBody Map<String,String> para){
ArdAlarmpointsWell result = ardAlarmpointsWellService.getWellById(para.get("id"));
--
Gitblit v1.9.3