Forráskód Böngészése

解决导出数据不准的问题

dzx 1 éve
szülő
commit
791883c63b

+ 2 - 2
src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertTemplateController.java

@@ -178,12 +178,12 @@ public class DataExpertTemplateController {
             }
         }
         if(dto.getIds() != null && !dto.getIds().isEmpty()){
-            String ids = dto.getIds().toString().substring(1, dto.getIds().toString().length() - 1).replaceAll(",","','");
+            String ids = dto.getIds().toString().substring(1, dto.getIds().toString().length() - 1).replaceAll(",","','").replaceAll(" ", "");
             conditions += " and id in ('" + ids + "')";
         }
         if(dto.getConditions() != null && dto.getConditions().size() != 0){
             for (DataExpertConditionsDto condition : dto.getConditions()) {
-                if(condition.getKeyType() == 1){
+                if(condition.getKeyType() == 1 && condition.getKeyValue() != null && !"".equals(condition.getKeyValue())){
                     conditions += " and " + condition.getKeyName() + " like '%" + condition.getKeyValue() + "%'";
                 }else if(condition.getKeyType() == 2 && condition.getKeyValue() != null && !"".equals(condition.getKeyValue())){
                     conditions += " and " + condition.getKeyName() + " in (";