diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 1fc51435e..9bb8ae480 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -27,7 +27,7 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, - @Param("depotIds") String depotIds, + @Param("depotArray") String[] depotArray, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -40,7 +40,7 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, - @Param("depotIds") String depotIds); + @Param("depotArray") String[] depotArray); String findMaterialsListByHeaderId( @Param("id") Long id); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 725494ab1..3f84457ec 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -99,12 +99,13 @@ public class DepotHeadService { List list=new ArrayList<>(); try{ String depotIds = depotService.findDepotStrByCurrentUser(); + String [] depotArray=depotIds.split(","); String [] creatorArray = getCreatorArray(roleType); Map personMap = personService.getPersonMap(); Map accountMap = accountService.getAccountMap(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotIds, offset, rows); + list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotArray, offset, rows); if (null != list) { for (DepotHeadVo4List dh : list) { if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) { @@ -146,10 +147,11 @@ public class DepotHeadService { Long result=null; try{ String depotIds = depotService.findDepotStrByCurrentUser(); + String [] depotArray=depotIds.split(","); String [] creatorArray = getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotIds); + result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotArray); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 894572e03..93eeb1d7b 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -74,8 +74,12 @@ and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) - - and di.depot_id in (#{depotIds}) + + and di.depot_id in ( + + #{depotId} + + ) and dh.creator in ( @@ -120,8 +124,12 @@ and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) - - and di.depot_id in (#{depotIds}) + + and di.depot_id in ( + + #{depotId} + + ) and dh.creator in (