图库需求
This commit is contained in:
parent
813672656d
commit
81ea44bfed
|
|
@ -8,7 +8,6 @@ import com.czg.account.service.PictureClassifyService;
|
|||
import com.czg.enums.DeleteEnum;
|
||||
import com.czg.enums.YesNoEnum;
|
||||
import com.czg.exception.CzgException;
|
||||
import com.czg.product.entity.ShopProdUnit;
|
||||
import com.czg.sa.StpKit;
|
||||
import com.czg.service.account.mapper.PictureClassifyMapper;
|
||||
import com.czg.utils.PageUtil;
|
||||
|
|
@ -34,8 +33,12 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
|
|||
queryWrapper.like(PictureClassify::getName, param.getName());
|
||||
}
|
||||
Long shopId = StpKit.USER.getLoginIdAsLong();
|
||||
queryWrapper.eq(PictureClassify::getShopId, shopId);
|
||||
queryWrapper.eq(PictureClassify::getIsDel, DeleteEnum.DELETED.value());
|
||||
queryWrapper.and(q -> {
|
||||
q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
|
||||
q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
|
||||
});
|
||||
});
|
||||
queryWrapper.eq(PictureClassify::getIsDel, DeleteEnum.NORMAL.value());
|
||||
queryWrapper.orderBy(PictureClassify::getSort, true);
|
||||
queryWrapper.orderBy(PictureClassify::getId, false);
|
||||
return queryWrapper;
|
||||
|
|
@ -51,10 +54,9 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
|
|||
public void addPictureClassify(PictureClassifyDTO dto) {
|
||||
Long shopId = StpKit.USER.getLoginIdAsLong();
|
||||
boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName())
|
||||
.eq(PictureClassify::getShopId, shopId)
|
||||
.and(q -> {
|
||||
q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
|
||||
q1.eq(PictureClassify::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value());
|
||||
q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
|
||||
});
|
||||
})
|
||||
);
|
||||
|
|
@ -73,11 +75,10 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
|
|||
Long shopId = StpKit.USER.getLoginIdAsLong();
|
||||
dto.setShopId(shopId);
|
||||
boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName())
|
||||
.eq(PictureClassify::getShopId, shopId)
|
||||
.ne(PictureClassify::getId, dto.getId())
|
||||
.and(q -> {
|
||||
q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
|
||||
q1.eq(PictureClassify::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value());
|
||||
q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
|
||||
});
|
||||
})
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue