feat: 检索对象基于用户所在行政区划

shuili-system/src/main/java/com/kms/common/utils/UserUtils.java

@@ -2,7 +2,11 @@ package com.kms.common.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.kms.framework.web.service.SysPermissionService;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysUserService;
+import com.kms.system.service.SysXzqhService;
+import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.utils.SpringUtils;
 import com.shuili.common.utils.StringUtils;
@@ -15,6 +19,24 @@ public class UserUtils {
 
     private static SysPermissionService sysPermissionService = null;
 
+    private static SysXzqhService sysXzqhService = null;
+
+    private static SysDeptService sysDeptService = null;
+
+    private static SysXzqhService getSysXzqhService() {
+        if (sysXzqhService == null) {
+            sysXzqhService = SpringUtils.getBean(SysXzqhService.class);
+        }
+        return sysXzqhService;
+    }
+
+    private static SysDeptService getSysDeptService() {
+        if (sysDeptService == null) {
+            sysDeptService = SpringUtils.getBean(SysDeptService.class);
+        }
+        return sysDeptService;
+    }
+
     private static SysUserService getUserService() {
         if (userService == null) {
             userService = SpringUtils.getBean(SysUserService.class);
@@ -29,6 +51,24 @@ public class UserUtils {
         return sysPermissionService;
     }
 
+    public static String getAdcd() {
+        SysUser user = getUser();
+        if (user == null) {
+            return "";
+        }
+        String cicd = "";
+        String deptId = user.getDeptId();
+        SysDept sysDept = getSysDeptService().getById(deptId);
+        if (sysDept != null) {
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = getSysXzqhService().getById(xzqhId);
+            if (xzqh != null) {
+                cicd = xzqh.getXzqhdm();
+            }
+        }
+        return cicd;
+    }
+
     public static SysUser getUser() {
 
         try {

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java

@@ -2,6 +2,7 @@ package com.kms.yg.df.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcd;
 import com.shuili.common.annotation.Excel;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -20,7 +21,7 @@ import java.util.Date;
 @TableName("att_dike_base")
 @Data
 @ApiModel("堤防安全管理基本信息")
-public class BsSgcDfSafeJbxx extends BaseEntity {
+public class BsSgcDfSafeJbxx extends BaseEntity implements IAdcd {
     private static final long serialVersionUID = 1L;
 
     /**

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java

@@ -48,8 +48,8 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper<BsSgcDfSafeJbxx> {
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>",
             "and dike_type = #{dto.dikeType} ",
             "</if>",
-            "<if test='dto.adcd != null and dto.adcd != \"\"'>",
-            "and adcd like concat(#{dto.adcd}, '%') ",
+            "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'>",
+            "and adcd like concat(#{dto.adcdQx}, '%') ",
             "</if>",
             "<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>",
             "and dike_grad = #{dto.dikeGrad} ",

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@@ -1,14 +1,15 @@
 package com.kms.yg.sz.domain;
 
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcd;
+import com.shuili.common.annotation.Excel;
+import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-import com.shuili.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 
 
 /**
@@ -20,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("att_waga_base")
 @Data
 @ApiModel("水闸安全管理基本信息")
-public class BsSgcSzSafeJbxx extends BaseEntity {
+public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
     private static final long serialVersionUID = 1L;
 
 

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java

@@ -43,8 +43,8 @@ public interface BsSgcSzSafeJbxxMapper extends BaseMapper<BsSgcSzSafeJbxx> {
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
             "and waga_type = #{dto.wagaType} ",
             "</if>",
-            "<if test='dto.adcd!= null and dto.adcd != \"\"'>",
-            "and adcd like concat(#{dto.adcd}, '%') ",
+            "<if test='dto.adcdQx!= null and dto.adcdQx != \"\"'>",
+            "and adcd like concat(#{dto.adcdQx}, '%') ",
             "</if>",
             "</script>"
     })

shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java

@@ -1,5 +1,7 @@
 package com.kms.yxgh.common.dto;
 
+import com.kms.common.utils.UserUtils;
+
 public interface IAdcd {
 
     String getAdcd();
@@ -7,7 +9,12 @@ public interface IAdcd {
     default String getAdcdQx() {
         String adcd = getAdcd();
         if (adcd == null) {
-            return null;
+            adcd = UserUtils.getAdcd();
+            if (adcd != null) {
+                return adcd.replaceAll("00(00)?$", "");
+            } else {
+                return adcd;
+            }
         }
         return adcd.replaceAll("00(00)?$", "");
     }