|
|
|
@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
import jnpf.entity.RecycleDeliveryOrderEntity;
|
|
|
|
|
import jnpf.entity.RecycleDeviceEntity;
|
|
|
|
|
import jnpf.mapper.RecycleDeviceMapper;
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
@ -323,6 +324,8 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
|
|
|
|
|
recycleDeviceQueryWrapper.lambda().eq(RecycleDeviceEntity::getBeLongCompanyId, userProvider.get().getOrganizeId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
recycleDeviceQueryWrapper.lambda().isNull(RecycleDeviceEntity::getDeleteMark);
|
|
|
|
|
|
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
|
Page<RecycleDeviceEntity> page = new Page<>(recycleDevicePagination.getCurrentPage(), recycleDevicePagination.getPageSize());
|
|
|
|
@ -369,7 +372,7 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void delete(RecycleDeviceEntity entity) {
|
|
|
|
|
if (StringUtils.isBlank(entity.getId())) {
|
|
|
|
|
if (StringUtils.isNoneBlank(entity.getId())) {
|
|
|
|
|
entity.setDeleteMark(1);
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
}
|
|
|
|
|