Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -r539d490b590abc0d7a6505279fd83c9500818695 -r4bc12f22d19e679a740674c2f86aedef69ecbff8 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 539d490b590abc0d7a6505279fd83c9500818695) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 4bc12f22d19e679a740674c2f86aedef69ecbff8) @@ -4937,16 +4937,25 @@ @Override public List> getMinMaxSessionSelectedProducts (int sessionId, String siteIdList) { - if(StringUtils.isNotBlank(siteIdList)) + + List myList = new ArrayList<>(Arrays.asList(siteIdList.split(","))); + + if(StringUtils.isNotBlank(siteIdList) && myList.size()==1 ) { return jdbcTemplate.queryForList ( "select distinct(mmcl.LINE_ID) as \"id\", mmcl.FIELD_ABBR as \"code\", mmspl.LEAD_TIME_STATUS as \"leadTimeStatus\", 'true' as \"line\", mmspl.order_cycle as \"orderCycle\",mmspl.lead_time as \"leadTime\" ,case when mmspl.per_car = 1 then 'true' else 'false' end as \"perCar\", 'true' as \"isStockEditOff\" " + "from MIN_MAX_CALC_LINE mmcl, MIN_MAX_SESSION_PROD_LINE mmspl \n" + "where mmspl.SESSION_ID = " + sessionId + " and mmspl.site_id in ( "+siteIdList+" ) and mmspl.PRODUCT_LINE_ID = mmcl.LINE_ID and mmcl.ACTIVE_FLAG = 1 order by mmcl.FIELD_ABBR" ); } - else { - return jdbcTemplate.queryForList("select distinct(mmcl.LINE_ID) as \"id\", mmcl.FIELD_ABBR as \"code\", mmspl.LEAD_TIME_STATUS as \"leadTimeStatus\", 'true' as \"line\", mmspl.order_cycle as \"orderCycle\",mmspl.lead_time as \"leadTime\" ,case when mmspl.per_car = 1 then 'true' else 'false' end as \"perCar\", 'true' as \"isStockEditOff\" " + - "from MIN_MAX_CALC_LINE mmcl, MIN_MAX_SESSION_PROD_LINE mmspl \n" + - "where mmspl.SESSION_ID = " + sessionId + " and mmspl.PRODUCT_LINE_ID = mmcl.LINE_ID and mmcl.ACTIVE_FLAG = 1 order by mmcl.FIELD_ABBR"); + else if(StringUtils.isNotBlank(siteIdList) && myList.size()>1 ) { + return jdbcTemplate.queryForList ( "select distinct(mmcl.LINE_ID) as \"id\", mmcl.FIELD_ABBR as \"code\" " + + " from MIN_MAX_CALC_LINE mmcl, MIN_MAX_SESSION_PROD_LINE mmspl \n" + + " where mmspl.SESSION_ID = " + sessionId + " and mmspl.site_id in ( "+siteIdList+" ) and mmspl.PRODUCT_LINE_ID = mmcl.LINE_ID and mmcl.ACTIVE_FLAG = 1 order by mmcl.FIELD_ABBR" ); + + } else { + + return jdbcTemplate.queryForList("select distinct(mmcl.LINE_ID) as \"id\", mmcl.FIELD_ABBR as \"code\" " + + " from MIN_MAX_CALC_LINE mmcl, MIN_MAX_SESSION_PROD_LINE mmspl \n" + + " where mmspl.SESSION_ID = " + sessionId + " and mmspl.PRODUCT_LINE_ID = mmcl.LINE_ID and mmcl.ACTIVE_FLAG = 1 order by mmcl.FIELD_ABBR"); } }