tijiao

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -697,10 +697,10 @@ public class UniversalController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null")) {
+        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null") && materialNameText != "" && !"".equals(materialNameText)) {
             mapValue.put("materialNameText", materialNameText);
         }
-        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
+        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null") && materialSpecificationText != "" && !"".equals(materialSpecificationText)) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -775,7 +775,6 @@ public class UniversalController extends BaseRESTfulController {
     @GetMapping("/getTransRange")
     public RESTfulResult getTransRange(){
         return success(universalMapper.getTransRange());
-
     }
 
 //    //测试质保书回显