|
@@ -105,7 +105,7 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
|
|
|
cmmsSubmission1.setVerificateMethod(cmmsSubmission.getVerificateMethod());
|
|
|
cmmsSubmission1.setVerificatePerson(cmmsSubmission.getVerificatePerson());
|
|
|
QueryWrapper<CmmsSubmission> queryWrapper = QueryGenerator.initQueryWrapper(cmmsSubmission1, req.getParameterMap());
|
|
|
- queryWrapper.like("sjcode",cmmsSubmission.getSjcode());
|
|
|
+ queryWrapper.like(cmmsSubmission.getSjcode()!=null && !cmmsSubmission.getSjcode().equals(""),"sjcode",cmmsSubmission.getSjcode());
|
|
|
Page<CmmsSubmission> page = new Page<CmmsSubmission>(pageNo, pageSize);
|
|
|
IPage<CmmsSubmission> pageList = cmmsSubmissionService.page(page, queryWrapper);
|
|
|
List<CmmsSubmissionQueryVO> submissionQueryVOList = pageList.getRecords().stream().map(i->{
|