Merge branch 'master-shared' into 'dev'

修改共享文档查询条件

See merge request eshop/biz_service_ebtp_extend!44
This commit is contained in:
付庆吉
2021-06-08 14:16:52 +08:00

View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.constant.EbtpRoleEnum;
import com.chinaunicom.mall.ebtp.extend.bizbidshared.dao.BizBidSharedMapper;
import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared;
import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO;
@ -33,7 +34,7 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl<BizBidSharedMapper,
LambdaQueryWrapper<BizBidShared> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName())
.like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole())
.like(BizBidShared::getSharedRoles,user.getCurrentRoleCode())
.like(!EbtpRoleEnum.SYSTEM_ADMIN.getRole().equals(user.getCurrentRoleCode()),BizBidShared::getSharedRoles,user.getCurrentRoleCode())
.orderByDesc(BizBidShared::getCreateDate);
if (bizBidNotice.getCreateDate() != null) {