Merge branch 'master' of http://180.76.52.24:10080/bc_zhang/fm

src/main/java/com/zglc/fm/service/FaultService.java

@@ -119,7 +119,7 @@ public class FaultService {
             criteria.andEqualTo("major_type", majorType);
         else
             criteria.andIsNull("major_type");
-        if(name != null)
+        if(name != null && !name.isEmpty())
         {
             criteria.andLike("fault_name",name);
         }