yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():自测问题修改;

Browse Source
master
jiyufei 4 months ago
parent 85d10e202f
commit a8ff7ccee6
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java
Unescape View File

@ -269,7 +269,7 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
if (!userProvider.get().getIsAdministrator()) {
recycleBucketQueryWrapper.lambda().eq(RecycleBucketEntity::getCompanyId, userProvider.get().getOrganizeId());
}
recycleBucketQueryWrapper.lambda().isNull(RecycleBucketEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleBucketEntity> page = new Page<>(recycleBucketPagination.getCurrentPage(), recycleBucketPagination.getPageSize());
@ -304,7 +304,7 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleBucketEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java
Unescape View File

@ -254,6 +254,7 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
if (!userProvider.get().getIsAdministrator()) {
recycleCameraQueryWrapper.lambda().eq(RecycleCameraEntity::getCompanyId, userProvider.get().getOrganizeId());
}
recycleCameraQueryWrapper.lambda().isNull(RecycleCameraEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
@ -289,7 +290,7 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleCameraEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
Unescape View File

@ -242,6 +242,8 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
recycleCleanOrderQueryWrapper.lambda().eq(RecycleCleanOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
}
recycleCleanOrderQueryWrapper.lambda().isNull(RecycleCleanOrderEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleCleanOrderEntity> page = new Page<>(recycleCleanOrderPagination.getCurrentPage(), recycleCleanOrderPagination.getPageSize());
@ -276,7 +278,7 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleCleanOrderEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -388,6 +388,8 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
recycleDeliveryOrderQueryWrapper.lambda().eq(RecycleDeliveryOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
}
recycleDeliveryOrderQueryWrapper.lambda().isNull(RecycleDeliveryOrderEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleDeliveryOrderEntity> page = new Page<>(recycleDeliveryOrderPagination.getCurrentPage(), recycleDeliveryOrderPagination.getPageSize());
@ -422,7 +424,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleDeliveryOrderEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
Unescape View File

@ -234,6 +234,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
}
}
recycleDeviceConfigQueryWrapper.lambda().isNull(RecycleDeviceConfigEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleDeviceConfigEntity> page = new Page<>(recycleDeviceConfigPagination.getCurrentPage(), recycleDeviceConfigPagination.getPageSize());
@ -273,7 +275,7 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleDeviceConfigEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java
Unescape View File

@ -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);
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java
Unescape View File

@ -288,6 +288,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
simCardQueryWrapper.lambda().eq(SimCardEntity::getCompanyId, userProvider.get().getOrganizeId());
}
simCardQueryWrapper.lambda().isNull(SimCardEntity::getDeleteMark);
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<SimCardEntity> page = new Page<>(simCardPagination.getCurrentPage(), simCardPagination.getPageSize());
@ -322,7 +323,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(SimCardEntity entity) {
if (StringUtils.isBlank(entity.getId())) {
if (StringUtils.isNoneBlank(entity.getId())) {
entity.setDeleteMark(1);
this.saveOrUpdate(entity);
}

Write Preview
Loading…
Cancel
Save