Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
墨大叔 2024-09-27 09:23:10 +08:00
commit 013ce24296

View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.model.service.impl;
import com.github.pagehelper.PageHelper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.StringUtils;
@ -156,7 +157,12 @@ public class ModelServiceImpl implements ModelService
@Override
public SmModelVO selectOne(SmModelQuery query) {
return modelMapper.selectOne(query);
PageHelper.startPage(1,1);
List<SmModelVO> list = this.selectSmModelList(query);
if (CollectionUtils.isEmptyElement(list)) {
return null;
}
return list.get(0);
}
/**