Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34592 -r34600 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34592) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34600) @@ -3104,7 +3104,13 @@ } Map nameToBrevityCodeMap = new HashMap(); if("dgshlyyMode".equals(patternOfReport)){ - String querySql = "select name,brevityCode from "+ OrgUnit.class.getSimpleName() +" where brevityCode is not null and brevityCode<>'' order by status asc "; + String querySql = "select name,brevityCode from "+ OrgUnit.class.getSimpleName() +" where "; + if(dbConnection.isSqlServer()){ + querySql += " brevityCode is not null and brevityCode<>'' "; + }else if(dbConnection.isOracle()){ + querySql += " trim(brevityCode) is not null "; + } + querySql += " order by status asc "; nameToBrevityCodeMap = objectDao.getKeyAndValueAreBothStringMap(querySql); } //启用排除属于科研项目的一次性物品申请单的发货数据