Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili

# Conflicts:
#	shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
#	shuili-system/src/main/java/com/kms/system/service/SysUserService.java

shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.common.utils.UserUtils;
 import com.kms.framework.manager.AsyncManager;
 import com.kms.framework.manager.factory.AsyncFactory;
+import com.kms.framework.web.domain.server.Sys;
 import com.kms.framework.web.service.SysPermissionService;
 import com.kms.framework.web.service.SysPermissionService.MenuDto;
 import com.kms.system.domain.SysXzqh;
@@ -16,6 +17,7 @@ import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysMenuService;
 import com.kms.system.service.SysUserService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.system.service.*;
 import com.kms.web.utils.WaterRequestUtil;
 import com.kms.web.utils.WaterResultV2;
 import com.kms.web.utils.singleDomain.SingleMenu;
@@ -224,6 +226,10 @@ public class SysLoginController extends BaseController {
      *
      * @return 用户信息
      */
+
+    @Autowired
+    private SysDeptService deptService;
+
     @ApiOperation("获取挡路用户信息")
     @GetMapping("getInfo")
     public AjaxResult getInfo() {
@@ -236,6 +242,13 @@ 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();
@@ -247,6 +260,7 @@ public class SysLoginController extends BaseController {
                 cicd = xzqh.getXzqhdm();
             }
         }
+        userService.updateWithReids(user);
 
         ajax.put("user", user);
         ajax.put("roles", roles);

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));
 

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@@ -93,10 +93,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 +130,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                         .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
                         .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
-
+        }
         return page;
 
     }

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -81,6 +81,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
 
 
 
+    @Autowired
+    SysDeptService SysDeptService;
 
     /**
      * 查询水闸安全管理基本信息列表
@@ -89,17 +91,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()),
+        SysUser sysUser = UserUtils.getUser();
-                Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
+        String[] roleIds = sysUser.getRoleIds();
-                        .ne(BsSgcSzSafeJbxx::getStatus,"0")
+        SysDept dept = sysUser.getDept();
-                        .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
+        String xzqhId = dept.getXzqhId();
-                        .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+
-                        .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+        String name = dept.getName();
-                        .isNull(BsSgcSzSafeJbxx::getExprDate)
+        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;
 
     }