|
@@ -12,6 +12,7 @@ import com.fjhx.customer.mapper.customer.CustomerUserMapper;
|
|
import com.fjhx.customer.service.customer.CustomerUserService;
|
|
import com.fjhx.customer.service.customer.CustomerUserService;
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
|
+import com.ruoyi.common.utils.wrapper.SqlField;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -30,6 +31,13 @@ public class CustomerUserServiceImpl extends ServiceImpl<CustomerUserMapper, Cus
|
|
@Override
|
|
@Override
|
|
public List<CustomerUserVo> getList(CustomerUserSelectDto dto) {
|
|
public List<CustomerUserVo> getList(CustomerUserSelectDto dto) {
|
|
IWrapper<CustomerUser> wrapper = getWrapper();
|
|
IWrapper<CustomerUser> wrapper = getWrapper();
|
|
|
|
+ //关键字检索
|
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
|
|
+ wrapper.keyword(dto.getKeyword(),
|
|
|
|
+ new SqlField("cu", CustomerUser::getName),
|
|
|
|
+ new SqlField("cu", CustomerUser::getEmail)
|
|
|
|
+ );
|
|
|
|
+ }
|
|
wrapper.orderByDesc("cu", CustomerUser::getId);
|
|
wrapper.orderByDesc("cu", CustomerUser::getId);
|
|
List<CustomerUserVo> list = this.baseMapper.getList(wrapper);
|
|
List<CustomerUserVo> list = this.baseMapper.getList(wrapper);
|
|
return list;
|
|
return list;
|
|
@@ -38,6 +46,13 @@ public class CustomerUserServiceImpl extends ServiceImpl<CustomerUserMapper, Cus
|
|
@Override
|
|
@Override
|
|
public Page<CustomerUserVo> getPage(CustomerUserSelectDto dto) {
|
|
public Page<CustomerUserVo> getPage(CustomerUserSelectDto dto) {
|
|
IWrapper<CustomerUser> wrapper = getWrapper();
|
|
IWrapper<CustomerUser> wrapper = getWrapper();
|
|
|
|
+ //关键字检索
|
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
|
|
+ wrapper.keyword(dto.getKeyword(),
|
|
|
|
+ new SqlField("cu", CustomerUser::getName),
|
|
|
|
+ new SqlField("cu", CustomerUser::getEmail)
|
|
|
|
+ );
|
|
|
|
+ }
|
|
wrapper.orderByDesc("cu", CustomerUser::getId);
|
|
wrapper.orderByDesc("cu", CustomerUser::getId);
|
|
Page<CustomerUserVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
Page<CustomerUserVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
return page;
|
|
return page;
|