diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntCheckMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntCheckMapper.java index 22f0f4e..8f71371 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntCheckMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntCheckMapper.java @@ -100,6 +100,7 @@ public interface BookEntCheckMapper { /*街道检查情况*/ List streetCheckMsg(@Param("startTime") String startTime, @Param("endTime") String endTime, + @Param("superiorOrgCode") String superiorOrgCode, @Param("streetCode") String streetCode, @Param("inherentRisks") List inherentRisks); diff --git a/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml b/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml index 0b59d0a..c195816 100644 --- a/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml +++ b/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml @@ -928,7 +928,7 @@ )rectifyedingNum from SysOrg so - where so.SuperiorOrgCode = '510114' + where so.SuperiorOrgCode = #{superiorOrgCode} and so.OrgCode = #{streetCode} diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 5a326cb..a842506 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -2797,6 +2797,8 @@ public class BaseController { SysUser sysUser = sysUserMapper.findById(userId); if(null != sysUser){ areaCode = sysUser.getAreaCode(); + }else{ + areaCode = constantsConfigure.getSuperiorOrgCode(); } return areaCode; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java b/inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java index c57f202..415c31c 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java @@ -705,7 +705,8 @@ public class ExportContorller extends com.rzyc.controller.BaseController { SysUser sysUser = getUser(streetCheckMsgDto.getUserId()); - String streetCode = sysUser.getStreetCode(); + String streetCode = ""; + String areaCode = getUserArea(sysUser.getSysuserid()); String startTime = DateUtils.getHandleTime(streetCheckMsgDto.getStartTime(),1); String entTime = DateUtils.getHandleTime(streetCheckMsgDto.getEndTime(),2); @@ -719,7 +720,7 @@ public class ExportContorller extends com.rzyc.controller.BaseController { } - List checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,streetCode,inherentRisks); + List checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,areaCode,streetCode,inherentRisks); if(null != checkMsgs && checkMsgs.size() > 0){ StreetCheckMsg streetCheckMsg = new StreetCheckMsg(); @@ -769,7 +770,8 @@ public class ExportContorller extends com.rzyc.controller.BaseController { SysUser sysUser = getUser(streetCheckMsgDto.getUserId()); - String streetCode = sysUser.getStreetCode(); + String streetCode = ""; + String areaCode = getUserArea(sysUser.getSysuserid()); List inherentRisks = new ArrayList<>(); @@ -781,7 +783,7 @@ public class ExportContorller extends com.rzyc.controller.BaseController { } - List checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,streetCode,inherentRisks); + List checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,areaCode,streetCode,inherentRisks); if(null != checkMsgs && checkMsgs.size() > 0){ StreetCheckMsg streetCheckMsg = new StreetCheckMsg();