|
@@ -36,7 +36,7 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
|
|
// SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
|
|
// SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
|
|
// SysUser user = udao.selectByPrimaryKey(uid);
|
|
// SysUser user = udao.selectByPrimaryKey(uid);
|
|
EsProMapper proMapper = UtilTools.getBean(EsProMapper.class);
|
|
EsProMapper proMapper = UtilTools.getBean(EsProMapper.class);
|
|
- Weekend weekend = new Weekend<>(EsPro.class);
|
|
|
|
|
|
+ Weekend<EsPro> weekend = new Weekend<>(EsPro.class);
|
|
WeekendCriteria<EsPro, Object> keywordCriteria = weekend.weekendCriteria();
|
|
WeekendCriteria<EsPro, Object> keywordCriteria = weekend.weekendCriteria();
|
|
if (StringUtils.isNotEmpty(searchtag)) {
|
|
if (StringUtils.isNotEmpty(searchtag)) {
|
|
searchtag ="%"+searchtag+"%";
|
|
searchtag ="%"+searchtag+"%";
|
|
@@ -44,7 +44,6 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
|
|
.orLike(EsPro::getRemark, searchtag);
|
|
.orLike(EsPro::getRemark, searchtag);
|
|
}
|
|
}
|
|
keywordCriteria.andEqualTo(EsPro::getUid,uid);
|
|
keywordCriteria.andEqualTo(EsPro::getUid,uid);
|
|
- weekend.orderBy("create_time desc");
|
|
|
|
int total = proMapper.selectCountByExample(weekend);
|
|
int total = proMapper.selectCountByExample(weekend);
|
|
XIUtils.pageSet(page, count);
|
|
XIUtils.pageSet(page, count);
|
|
List<EsPro> eList = proMapper.selectByExample(weekend);
|
|
List<EsPro> eList = proMapper.selectByExample(weekend);
|