diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
index 65408c4c..3c4aa4d2 100644
--- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
@@ -50,6 +50,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -229,6 +230,10 @@ public class SysLoginController extends BaseController {
      *
      * @return 用户信息
      */
+
+    @Autowired
+    private SysDeptService deptService;
+
     @ApiOperation("获取挡路用户信息")
     @GetMapping("getInfo")
     public AjaxResult getInfo() {
@@ -241,10 +246,15 @@ public class SysLoginController extends BaseController {
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         AjaxResult ajax = AjaxResult.success();
+        List<String> roleIds = new ArrayList<>();
+        for (String role : roles) {
+            roleIds.add(role);
+        }
+        SysDept sysDept = deptService.get(user.getDeptId());
+        user.setDept(sysDept);
+        user.setRoleIds(roleIds.toArray(new String[roles.size()]));
 
         String cicd = "";
-        String deptId = user.getDeptId();
-        SysDept sysDept = sysDeptService.getById(deptId);
         if (sysDept != null) {
             String xzqhId = sysDept.getXzqhId();
             SysXzqh xzqh = sysXzqhService.getById(xzqhId);
@@ -252,6 +262,7 @@ public class SysLoginController extends BaseController {
                 cicd = xzqh.getXzqhdm();
             }
         }
+        userService.updateWithReids(user);
 
         ajax.put("user", user);
         ajax.put("roles", roles);
diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
index cb9a04c6..b984860b 100644
--- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
+++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
@@ -29,7 +29,6 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
 
 
     public String getSubString(String adcd) {
-
         SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class)
                 .eq(SysXzqh::getXzqhdm, adcd));
 
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
index 9138b78b..f6bd1111 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.BaseEntityUtils;
+import com.kms.common.utils.UserUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
@@ -18,6 +19,8 @@ import com.shuili.common.annotation.Log;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.enums.BusinessType;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -93,10 +96,35 @@ public class BsSgcDfSafeJbxxController extends BaseController {
      * 查询水闸安全管理基本信息列表
      */
     @PostMapping("/list")
-    @ApiOperation("水闸安全管理基本信息列表")
+    @ApiOperation("堤防管理基本信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcDfSafeJbxx> sp) {
         BsSgcDfSafeJbxx data = sp.getData();
-        Page<BsSgcDfSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+        SysUser sysUser = UserUtils.getUser();
+        String[] roleIds = sysUser.getRoleIds();
+        SysDept dept = sysUser.getDept();
+        String xzqhId = dept.getXzqhId();
+
+        String name = dept.getName();
+        boolean isGLDW=false;
+        for (String roleId:roleIds){
+            if (roleId.equals("Yw00352")){
+                isGLDW=true;
+                break;
+            }
+        }
+        Page<BsSgcDfSafeJbxx> page=new Page<>();
+        if (isGLDW){
+            page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+                    Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
+                            .ne(BsSgcDfSafeJbxx::getStatus, "0")
+                            .eq(BsSgcDfSafeJbxx::getMnun,name)
+                            .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
+                            .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
+                            .isNull(BsSgcDfSafeJbxx::getExprDate)
+                            .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
+                            .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
+        }else {
+         page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                 Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
                         .ne(BsSgcDfSafeJbxx::getStatus, "0")
                         .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
@@ -105,7 +133,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                         .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
                         .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
-
+        }
         return page;
 
     }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
index d0566ad1..01f8ff1c 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.BaseEntityUtils;
+import com.kms.common.utils.UserUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
@@ -13,6 +14,8 @@ import com.shuili.common.annotation.Log;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.enums.BusinessType;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -81,6 +84,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
 
 
 
+    @Autowired
+    SysDeptService SysDeptService;
 
     /**
      * 查询水闸安全管理基本信息列表
@@ -89,17 +94,41 @@ public class BsSgcSzSafeJbxxController extends BaseController {
     @ApiOperation("水闸安全管理基本信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
         BsSgcSzSafeJbxx data = sp.getData();
-        Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
-                Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
-                        .ne(BsSgcSzSafeJbxx::getStatus,"0")
-                        .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
-                        .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
-                        .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
-                        .isNull(BsSgcSzSafeJbxx::getExprDate)
+        SysUser sysUser = UserUtils.getUser();
+        String[] roleIds = sysUser.getRoleIds();
+        SysDept dept = sysUser.getDept();
+        String xzqhId = dept.getXzqhId();
+
+        String name = dept.getName();
+        boolean isGLDW=false;
+        for (String roleId:roleIds){
+            if (roleId.equals("Yw00352")){
+                isGLDW=true;
+                break;
+            }
+        }
+        Page<BsSgcSzSafeJbxx> page=new Page<>();
+        if (isGLDW){
+            page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+                    Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
+                            .ne(BsSgcSzSafeJbxx::getStatus, "0")
+                            .eq(BsSgcSzSafeJbxx::getMnun,name)
+                            .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
+                            .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+                            .isNull(BsSgcSzSafeJbxx::getExprDate)
+                            .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
+        }else {
+          page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+                    Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
+                            .ne(BsSgcSzSafeJbxx::getStatus, "0")
+                            .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
+                            .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+                            .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                            .isNull(BsSgcSzSafeJbxx::getExprDate)
 //                        .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)
-                        .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
-
+                            .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
 
+        }
         return page;
 
     }