Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -23,7 +23,7 @@ import java.io.*;
  */
 @RestController
 @RequestMapping("/inspect")
-@Api(value = "cms页面管理接口",description = "cms页面管理接口,提供页面的增、删、改、查")
+@Api(value = "评估接口管理接口",description = "评估管理接口,提供页面的增、删、改、查")
 public class InspectController {
     @Autowired
     private InspectService inspectService;

src/main/java/com/zjty/inspect/service/impl/TechnologyServiceImpl.java

@@ -112,8 +112,8 @@ public class TechnologyServiceImpl implements TechnologyService {
             @Override
             public Predicate toPredicate(Root<Technology> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 List<Predicate> predicateList = new ArrayList<Predicate>();
-                if(searchMap.get("technologyName")!=null && !"".equals(searchMap.get("technologyName"))){
-                    predicateList.add(cb.like(root.get("technologyName").as(String.class),"%"+(String)searchMap.get("technologyName")+"%"));
+                if (searchMap.get("technologyName")!=null && !"".equals(searchMap.get("technologyName"))) {
+                    predicateList.add(cb.like(root.get("technologyName").as(String.class), "%"+(String)searchMap.get("technologyName")+"%"));
                 }
                 return cb.and( predicateList.toArray(new Predicate[predicateList.size()]));