Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/controller/CmmsSpotcheckController.java

@@ -53,7 +53,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 	  * @param spotcheckid 设备点检ID
 	  */
 	 @ApiOperation("获取设备点检详细信息——修改设备点检时")
-	 @GetMapping(value = "getInfoBySpotcheckid/{spotcheckid}")
+	 @GetMapping(value = "/getInfoBySpotcheckid/{spotcheckid}")
 	 public Result<CmmsSpotcheckQueryVO> getInfoBySpotcheckid(@PathVariable("spotcheckid") String spotcheckid) {
 		 return Result.OK(cmmsSpotcheckService.selectCmmsSpotcheckBySpotcheckid(spotcheckid));
 	 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/controller/CmmsSpotcheckContentController.java

@@ -111,7 +111,9 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CmmsSpotcheckContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsSpotcheckContent, req.getParameterMap());
+		CmmsSpotcheckContent content = new CmmsSpotcheckContent();
+		QueryWrapper<CmmsSpotcheckContent> queryWrapper = QueryGenerator.initQueryWrapper(content, req.getParameterMap());
+		queryWrapper.like(cmmsSpotcheckContent.getContentname()!=null && !cmmsSpotcheckContent.getContentname().equals(""),"contentname",cmmsSpotcheckContent.getContentname());
 		Page<CmmsSpotcheckContent> page = new Page<CmmsSpotcheckContent>(pageNo, pageSize);
 		IPage<CmmsSpotcheckContent> pageList = cmmsSpotcheckContentService.page(page, queryWrapper);
 		return Result.OK(pageList);