From a50198ad3f2d16305b2e47507f7a29a1d14015f3 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Mon, 17 Feb 2025 10:27:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysXzqhController.java  | 49 ++++++++-----------
 .../kms/system/service/SysXzqhService.java    |  6 +--
 .../df/controller/BsSgcDfBzbpController.java  | 12 ++---
 .../controller/BsSgcDfSafeJbxxController.java |  4 +-
 .../df/controller/BsSgcDfYhxxController.java  | 11 ++---
 .../kms/yg/df/service/BsSgcDfAqrwService.java | 27 +++++-----
 .../yg/df/service/BsSgcDfSafeJbxxService.java |  7 ++-
 .../sz/controller/BsSgcSzBzbpController.java  | 15 +++---
 .../controller/BsSgcSzSafeJbxxController.java |  5 +-
 .../sz/controller/BsSgcSzYhxxController.java  |  9 ++--
 .../com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java |  1 -
 .../kms/yg/sz/service/BsSgcSzAqrwService.java | 26 ++++++----
 .../kms/yg/sz/service/BsSgcSzYhxxService.java |  8 +--
 .../mapper/yg/df/BsSgcDfAqrwMapper.xml        | 10 ++--
 .../mapper/yg/df/BsSgcDfFzrMapper.xml         | 15 +++---
 .../mapper/yg/df/BsSgcDfSafeJbxxMapper.xml    | 15 +++---
 .../mapper/yg/df/BsSgcDfYhxxMapper.xml        |  4 +-
 .../mapper/yg/sz/BsSgcSzAqrwMapper.xml        | 23 ++++-----
 .../mapper/yg/sz/BsSgcSzFzrMapper.xml         | 15 +++---
 .../mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml    | 19 +++----
 .../mapper/yg/sz/BsSgcSzYhxxMapper.xml        |  3 +-
 21 files changed, 147 insertions(+), 137 deletions(-)

diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
index c63925af..9509381b 100644
--- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
@@ -15,7 +15,6 @@ 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.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -63,42 +62,36 @@ public class SysXzqhController extends BaseController {
 
     @GetMapping("/common")
     @ApiOperation("通用行政区划")
-    public AjaxResult common(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) {
-        if (StringUtils.isEmpty(xzqhdm)) {
-            SysUser user = UserUtils.getUser();
-            String deptId = user.getDeptId();
-            SysDept sysDept = sysDeptService.getById(deptId);
-            String xzqhId = sysDept.getXzqhId();
-            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+    public AjaxResult common() {
+        SysUser user = UserUtils.getUser();
+        String deptId = user.getDeptId();
+        SysDept sysDept = sysDeptService.getById(deptId);
+        String xzqhId = sysDept.getXzqhId();
+        SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+        String userName = user.getUserName();
+        /*if (userName.equals("admin")) {
+            List<SysXzqh> list = sysXzqhService.list();
+            return AjaxResult.success(list);
+        }else */
+        if (xzqh.getLayer() == 5) {
+            String substring = xzqh.getXzqhdm().substring(0, 2);
             QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
-            queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
-                    .eq("LAYER", xzqh.getLayer());
-
+            queryWrapper.likeRight("XZQHDM", substring);
+            queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
             List<SysXzqh> list = sysXzqhService.list(queryWrapper);
             return AjaxResult.success(list);
-        } else {
-            SysXzqh xzqh = sysXzqhService.getById(xzqhdm);
+        } else if (xzqh.getLayer() == 4) {
+            String substring = xzqh.getXzqhdm().substring(0, 4);
             QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
-            queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
-                    .eq("LAYER", xzqh.getLayer() - 1);
+            queryWrapper.likeRight("XZQHDM", substring);
+            queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
             List<SysXzqh> list = sysXzqhService.list(queryWrapper);
             return AjaxResult.success(list);
+        } else {
+            return AjaxResult.success(xzqh);
         }
     }
 
-    private String getQuery(String xzqhdm) {
-        int index = xzqhdm.lastIndexOf("000");
-        if (index >= 6) {
-            return getQuery(xzqhdm.substring(0, index));
-        }
-        index = xzqhdm.lastIndexOf("00");
-        if (index >= 0 && index < 6) {
-            return getQuery(xzqhdm.substring(0, index));
-        }
-        return xzqhdm;
-    }
-
-
     /**
      * 查询行政区划列表
      */
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 b984860b..08f22b2b 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
@@ -37,9 +37,9 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
         }
 
 
-        if (sysXzqh.getLayer() == 1) {
+        if (sysXzqh.getLayer() == 5) {
             return sysXzqh.getXzqhdm().substring(0, 2);
-        } else if (sysXzqh.getLayer() == 2) {
+        } else if (sysXzqh.getLayer() == 4) {
             return sysXzqh.getXzqhdm().substring(0, 4);
         }else {
             return sysXzqh.getXzqhdm();
@@ -72,6 +72,4 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
         return sysXzqh.getXzqhdm();
     }
 
-
-
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
index f1592868..f8e5f042 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
@@ -70,10 +70,10 @@ public class BsSgcDfBzbpController extends BaseController
                 QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
                 sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
                 SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
+                if (xzqh.getLayer()==5) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 2);
 
-                } else if (xzqh.getLayer()==2) {
+                } else if (xzqh.getLayer()==4) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 4);
 
                 }else {
@@ -91,10 +91,10 @@ public class BsSgcDfBzbpController extends BaseController
             String xzqhId = sysDept.getXzqhId();
             SysXzqh xzqh = sysXzqhService.getById(xzqhId);
             String substring = "";
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 substring = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 substring = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
@@ -108,10 +108,10 @@ public class BsSgcDfBzbpController extends BaseController
             sysXzqhQueryWrapper.eq("XZQHDM", adcd);
 
             SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 adcd = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 adcd = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
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 87cd87ed..9d7e7222 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
@@ -134,7 +134,6 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         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())
@@ -145,11 +144,10 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         }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())
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
                         .isNull(BsSgcDfSafeJbxx::getExprDate)
-                        .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
+                        .likeRight(data.getAdcd()!= null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                         .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
         }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
index 7485fbc7..e54de716 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
@@ -11,6 +11,7 @@ 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.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,9 +50,7 @@ public class BsSgcDfYhxxController extends BaseController
 
         HashMap<String, HashMap<String,String>> dto = bsSgcSzYhxxService.getHistogram(layer, sysXzqhService.getSubString(xzqh));
 
-
         return dto;
-
     }
 
 
@@ -67,14 +66,14 @@ public class BsSgcDfYhxxController extends BaseController
         List<HashMap<String, String>> listBy = new ArrayList<>();
         HashMap<String, String> map = new HashMap<>();
         for (PieDto pieDto : list) {
-            if (pieDto.getStatus().equals("0")) {
+            if (StringUtils.isNotEmpty(pieDto.getStatus())&&pieDto.getStatus().equals("0")) {
                 pieDto.setStatus("未解决");
             }else {
                 pieDto.setStatus("已解决");
             }
-
-            map.put(pieDto.getStatus(), pieDto.getNum());
-
+            if (StringUtils.isNotEmpty(pieDto.getStatus())) {
+                map.put(pieDto.getStatus(), pieDto.getNum());
+            }
         }
         listBy.add(map);
         return listBy;
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
index 67a00fe8..1accecab 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
@@ -17,6 +17,7 @@ import com.kms.yg.sz.domain.dto.AqrwDto;
 import com.kms.yg.sz.domain.dto.NumDto;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -149,8 +150,10 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
         BsSgcDfAqrw DfAqrw = bsSgcDfAqrwMapper.selectById(taskId);
 
         String adcd = DfAqrw.getAdcd();
-        SysXzqh byId = sysXzqhService.getById(adcd);
-
+        QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd)
+                .apply("RIGHT(XZQHDM, 6) = '000000'");
+        SysXzqh byId= sysXzqhService.getOne(queryWrapper);
         Integer layer = byId.getLayer();
 
         List<NumDto> Num = bsSgcDfAqrwMapper.getNum(sysXzqhService.getSubString(adcd), layer,taskId);
@@ -168,25 +171,25 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
             AqrwDto aqrwDto = new AqrwDto();
             aqrwDto.setAdcdName(numDto.getName());
             for (NumDto dto : zeroNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setZeroNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : oneNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setOneNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : twoNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setTwoNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : threeNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setThreeNum(dto.getNum());
                 }
             }
@@ -210,8 +213,10 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
 
         // 获取adcd属性值
         String adcd = DfAqrw.getAdcd();
-        // 根据adcd属性值查询SysXzqh对象
-        SysXzqh byId = sysXzqhService.getById(adcd);
+        QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd)
+                .apply("RIGHT(XZQHDM, 6) = '000000'");
+        SysXzqh byId= sysXzqhService.getOne(queryWrapper);
 
         // 获取层级属性值
         Integer layer = byId.getLayer();
@@ -230,7 +235,7 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
             // 遍历one列表
             for (NumDto numDto : one) {
                 // 如果numDto的名称与aqrwDto的adcdName属性值相等，则将numDto的num属性值赋给aqrwDto的one属性
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotEmpty(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setOne(numDto.getNum());
 
                 }
@@ -239,7 +244,7 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
             // 遍历two列表
             for (NumDto numDto : two) {
                 // 如果numDto的名称与aqrwDto的adcdName属性值相等，则将numDto的num属性值赋给aqrwDto的two属性
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotEmpty(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setTwo(numDto.getNum());
 
                 }
@@ -247,7 +252,7 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
             // 遍历three列表
             for (NumDto numDto : three) {
                 // 如果numDto的名称与aqrwDto的adcdName属性值相等，则将numDto的num属性值赋给aqrwDto的three属性
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotEmpty(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setThree(numDto.getNum());
 
                 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
index b7e9f3d9..a85334c0 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
@@ -17,6 +17,7 @@ import com.kms.yg.sz.domain.dto.PieDto;
 import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -107,14 +108,16 @@ public class BsSgcDfSafeJbxxService extends BaseService<BsSgcDfSafeJbxxMapper, B
             hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
             for (int j = 0; j < pieDtos.size(); j++) {
                 if (ObjectUtil.isNotEmpty(pieDtos.get(j).getName())){
-                if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
+                if (StringUtils.isNotEmpty(pieDtos.get(j).getName())&&pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
 //                    hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
                     hashMap.put(pieDtos.get(j).getStatus(), pieDtos.get(j).getNum());
                 }
                 }
             }
-            map.put(pieDtos.get(i).getName(), hashMap);
+            if(StringUtils.isNotEmpty(pieDtos.get(i).getName())) {
 
+                map.put(pieDtos.get(i).getName(), hashMap);
+            }
 
         }
 
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
index b5b7ec7d..f2e6766e 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
@@ -83,10 +83,10 @@ public class BsSgcSzBzbpController extends BaseController
                 QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
                 sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
                 SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
+                if (xzqh.getLayer()==5) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 2);
 
-                } else if (xzqh.getLayer()==2) {
+                } else if (xzqh.getLayer()==4) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 4);
 
                 }else {
@@ -100,12 +100,12 @@ public class BsSgcSzBzbpController extends BaseController
         }else if (adcd == null) {
             SysUser user = UserUtils.getUser();
             SysDept dept = user.getDept();
-            SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId().substring(0,6));
+            SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId());
             String substring = "";
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 substring = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 substring = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
@@ -117,12 +117,11 @@ public class BsSgcSzBzbpController extends BaseController
 
             QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
             sysXzqhQueryWrapper.eq("XZQHDM", adcd);
-
             SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 adcd = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 adcd = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
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 582d2b05..622910a3 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
@@ -132,7 +132,6 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         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())
@@ -142,12 +141,10 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         }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(xzqhId != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
-//                        .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)
+                            .likeRight(data.getAdcd() != null , BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                             .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
 
         }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
index 2c92e9d1..12a63693 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
@@ -12,6 +12,7 @@ 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.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -70,14 +71,14 @@ public class BsSgcSzYhxxController extends BaseController
         List<HashMap<String, String>> listBy = new ArrayList<>();
         HashMap<String, String> map = new HashMap<>();
         for (PieDto pieDto : list) {
-            if (pieDto.getStatus().equals("0")) {
+            if (StringUtils.isNotEmpty(pieDto.getStatus())&&pieDto.getStatus().equals("0")) {
                 pieDto.setStatus("未解决");
             }else {
                 pieDto.setStatus("已解决");
             }
-
-            map.put(pieDto.getStatus(), pieDto.getNum());
-
+            if (StringUtils.isNotEmpty(pieDto.getStatus())) {
+                map.put(pieDto.getStatus(), pieDto.getNum());
+            }
         }
         listBy.add(map);
         return listBy;
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
index ab192518..aeb4cafe 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
@@ -28,7 +28,6 @@ import java.util.Date;
 public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
     private static final long serialVersionUID = 1L;
 
-
     /**
      * 水闸名称
      */
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
index 8f8af142..2830a18a 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.system.domain.SysXzqh;
@@ -147,7 +148,10 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
         BsSgcSzAqrw szAqrw = bsSgcSzAqrwMapper.selectById(taskId);
 
         String adcd = szAqrw.getAdcd();
-        SysXzqh byId = sysXzqhService.getById(adcd);
+        QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd)
+                .apply("RIGHT(XZQHDM, 6) = '000000'");
+        SysXzqh byId = sysXzqhService.getOne(queryWrapper);
 
         Integer layer = byId.getLayer();
 
@@ -166,25 +170,25 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
             AqrwDto aqrwDto = new AqrwDto();
             aqrwDto.setAdcdName(numDto.getName());
             for (NumDto dto : zeroNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setZeroNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : oneNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setOneNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : twoNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setTwoNum(dto.getNum());
                 }
             }
 
             for (NumDto dto : threeNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
+                if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
                     aqrwDto.setThreeNum(dto.getNum());
                 }
             }
@@ -201,7 +205,11 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
         BsSgcSzAqrw szAqrw = bsSgcSzAqrwMapper.selectById(taskId);
 
         String adcd = szAqrw.getAdcd();
-        SysXzqh byId = sysXzqhService.getById(adcd);
+
+        QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd)
+                .apply("RIGHT(XZQHDM, 6) = '000000'");
+        SysXzqh byId= sysXzqhService.getOne(queryWrapper);
 
         Integer layer = byId.getLayer();
 
@@ -217,20 +225,20 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
         for (AqrwDto aqrwDto : dtoList) {
 
             for (NumDto numDto : one) {
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotBlank(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setOne(numDto.getNum());
 
                 }
             }
 
             for (NumDto numDto : two) {
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotBlank(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setTwo(numDto.getNum());
 
                 }
             }
             for (NumDto numDto : three) {
-                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                if (StringUtils.isNotBlank(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
                     aqrwDto.setThree(numDto.getNum());
 
                 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
index 4f5825bd..350427bf 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
@@ -6,6 +6,7 @@ import com.kms.yg.sz.domain.dto.HistogramDto;
 import com.kms.yg.sz.domain.dto.PieDto;
 import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,12 +43,13 @@ public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYh
             HashMap<String, String> hashMap = new HashMap<>();
             hashMap.put(list.get(i).getStatus(), list.get(i).getNum());
             for (int j = 0; j < list.size(); j++) {
-                if (list.get(j).getName().equals(list.get(i).getName()) && !list.get(j).getStatus().equals(list.get(i).getStatus())) {
+                if (StringUtils.isNotEmpty(list.get(j).getName())&&list.get(j).getName().equals(list.get(i).getName()) && !list.get(j).getStatus().equals(list.get(i).getStatus())) {
                     hashMap.put(list.get(j).getStatus(), list.get(j).getNum());
                 }
             }
-            map.put(list.get(i).getName(), hashMap);
-
+            if(StringUtils.isNotEmpty(list.get(i).getName())) {
+                map.put(list.get(i).getName(), hashMap);
+            }
         }
         return map;
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
index dac7ff09..fc6dc413 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
@@ -9,7 +9,7 @@
                COUNT(1) num
         FROM bs_sgc_df_dfrw ss
                  LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code
-                 LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
+                 LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6)
     </sql>
 
 
@@ -21,7 +21,7 @@
 
     <select id="getZeroNum" resultMap="NumDto">
         <include refid="info"></include>
-        where task_id =#{taskId} and ss.`status`="0"
+        where task_id =#{taskId} and ss.`status`='0'
         <if test="layer==1">
            GROUP BY LEFT(sj.adcd,4)
         </if>
@@ -31,7 +31,7 @@
     </select>
     <select id="getOneNum" resultMap="NumDto">
         <include refid="info"></include>
-        where task_id =#{taskId} and ss.`status`="1"
+        where task_id =#{taskId} and ss.`status`='1'
         <if test="layer==1">
             GROUP BY LEFT(sj.adcd,4)
         </if>
@@ -41,7 +41,7 @@
     </select>
     <select id="getTwoNum" resultMap="NumDto">
         <include refid="info"></include>
-        where task_id =#{taskId} and ss.`status`="2"
+        where task_id =#{taskId} and ss.`status`='2'
         <if test="layer==1">
             GROUP BY LEFT(sj.adcd,4)
         </if>
@@ -51,7 +51,7 @@
     </select>
     <select id="getThreeNum" resultMap="NumDto">
         <include refid="info"></include>
-        where task_id =#{taskId} and ss.`status`="3"
+        where task_id =#{taskId} and ss.`status`='2'
         <if test="layer==1">
             GROUP BY LEFT(sj.adcd,4)
         </if>
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
index aa37049d..478057f9 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
@@ -18,7 +18,8 @@
                sf.type
         from bs_sgc_df_fzr sf
                  left join att_dike_base sj on sf.dike_code = sj.dike_code
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on LEFT(sj.adcd,6)=LEFT(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -74,11 +75,11 @@
 
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY sj.adcd
         </if>
@@ -90,11 +91,11 @@
 
     <select id="getType2" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY sj.adcd
         </if>
@@ -106,11 +107,11 @@
 
     <select id="getType3" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY sj.adcd
         </if>
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
index ce50acdc..72dfc840 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
@@ -9,7 +9,8 @@
                count(1) num,
                sj.`status`
         from att_dike_base sj
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on LEFT(sj.adcd,6)=left(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -23,11 +24,11 @@
 
     <select id="getPie" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
         </if>
@@ -40,11 +41,11 @@
 
     <select id="getNo" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY sj.adcd
         </if>
@@ -58,11 +59,11 @@
 
     <select id="getFin" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
         </if>
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
index 70376686..2b656295 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
@@ -10,7 +10,8 @@
                sx.`name`
         from bs_sgc_df_yhxx sy
             left join att_dike_base sj on sj.dike_code=sy.dike_code
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on LEFT(sj.adcd,6)=LEFT(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -43,6 +44,7 @@
         <include refid="info"></include>
         <if test="layer==1">
             WHERE
+
             sj.adcd LIKE concat(#{adcd},'%')  GROUP BY LEFT(sj.adcd,4)
         </if>
         <if test="layer==2">
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
index 26b6fb5c..2f3648e0 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
@@ -9,7 +9,8 @@
                COUNT(1) num
         FROM bs_sgc_sz_szrw ss
                  LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code
-                 LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
+                 LEFT JOIN sys_xzqh sx ON LEFT(sj.adcd,6) = LEFT(sx.XZQHDM,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -22,50 +23,50 @@
     <select id="getZeroNum" resultMap="NumDto">
         <include refid="info"></include>
         where task_id =#{taskId} and ss.`status`="0"
-        <if test="layer==1">
+        <if test="layer==5">
            GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             GROUP BY sj.adcd
         </if>
     </select>
     <select id="getOneNum" resultMap="NumDto">
         <include refid="info"></include>
         where task_id =#{taskId} and ss.`status`="1"
-        <if test="layer==1">
+        <if test="layer==5">
             GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             GROUP BY sj.adcd
         </if>
     </select>
     <select id="getTwoNum" resultMap="NumDto">
         <include refid="info"></include>
         where task_id =#{taskId} and ss.`status`="2"
-        <if test="layer==1">
+        <if test="layer==5">
             GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             GROUP BY sj.adcd
         </if>
     </select>
     <select id="getThreeNum" resultMap="NumDto">
         <include refid="info"></include>
         where task_id =#{taskId} and ss.`status`="3"
-        <if test="layer==1">
+        <if test="layer==5">
             GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             GROUP BY sj.adcd
         </if>
     </select>
     <select id="getNum" resultMap="NumDto">
         <include refid="info"></include>
         where task_id =#{taskId}
-        <if test="layer==1">
+        <if test="layer==5">
             GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             GROUP BY sj.adcd
         </if>
     </select>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
index aea2faff..169b46fd 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
@@ -18,7 +18,8 @@
                sf.type
         from bs_sgc_sz_fzr sf
                  left join att_waga_base sj on sf.waga_code = sj.waga_code
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on left(sj.adcd,6)=Left(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -74,11 +75,11 @@
 
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY sj.adcd
         </if>
@@ -90,11 +91,11 @@
 
     <select id="getType2" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY sj.adcd
         </if>
@@ -106,11 +107,11 @@
 
     <select id="getType3" resultMap="pieDto">
         <include refid="getHistogram"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY sj.adcd
         </if>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
index cc3ac87a..aed2e660 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
@@ -6,10 +6,11 @@
 
     <sql id="info">
         select sx.name,
-               count(1) num,
+               COUNT(1) AS num,
                sj.`status`
         from att_waga_base sj
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on LEFT(sj.adcd,6)=LEFT(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>
 
 
@@ -23,28 +24,28 @@
 
     <select id="getPie" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
         </if>
         <if test="layer==3">
             WHERE
-            sj.adcd = #{adcd}
+            sj.adcd = LEFT(#{adcd},6)
         </if>
     </select>
 
 
     <select id="getNo" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY sj.adcd
         </if>
@@ -58,11 +59,11 @@
 
     <select id="getFin" resultMap="pieDto">
         <include refid="info"></include>
-        <if test="layer==1">
+        <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
         </if>
-        <if test="layer==2">
+        <if test="layer==4">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
         </if>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
index b7cff06f..51677f11 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
@@ -10,7 +10,8 @@
                sx.`name`
         from bs_sgc_sz_yhxx sy
             left join att_waga_base sj on sj.waga_code=sy.waga_code
-                 left join sys_xzqh sx on sj.adcd=sx.xzqhdm
+                 left join sys_xzqh sx on LEFT(sj.adcd,6)=LEFT(sx.xzqhdm,6)
+            AND RIGHT(sx.xzqhdm, 6) = '000000'
     </sql>