feat(device):查询加上删除判断;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java

@@ -69,7 +69,6 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
      */
     @Override
     public List<RecycleBucketEntity> getTypeList(RecycleBucketPagination recycleBucketPagination, String dataType) {
-        String userId = userProvider.get().getUserId();
         List<String> AllIdList = new ArrayList();
         List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -335,8 +334,6 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
     @Override
     @Transactional
     public void saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) throws Exception {
-        UserInfo userInfo = userProvider.get();
-        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleBucketForm = JsonUtil.getJsonToBean(
                 generaterSwapUtil.swapDatetime(RecycleBucketConstant.getFormData(), recycleBucketForm), RecycleBucketForm.class);
         RecycleBucketEntity entity = JsonUtil.getJsonToBean(recycleBucketForm, RecycleBucketEntity.class);
@@ -356,6 +353,7 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
     public List<RecycleBucketEntity> getByDeviceCode(String deviceCode) {
         QueryWrapper<RecycleBucketEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(RecycleBucketEntity::getDeviceCode, deviceCode);
+        queryWrapper.lambda().isNull(RecycleBucketEntity::getDeleteMark);
         return this.list(queryWrapper);
     }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java

@@ -69,7 +69,6 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
      */
     @Override
     public List<RecycleCameraEntity> getTypeList(RecycleCameraPagination recycleCameraPagination, String dataType) {
-        String userId = userProvider.get().getUserId();
         List<String> AllIdList = new ArrayList();
         List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -321,8 +320,6 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
     @Override
     @Transactional
     public void saveOrUpdate(RecycleCameraForm recycleCameraForm, String id, boolean isSave) throws Exception {
-        UserInfo userInfo = userProvider.get();
-        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleCameraForm = JsonUtil.getJsonToBean(
                 generaterSwapUtil.swapDatetime(RecycleCameraConstant.getFormData(), recycleCameraForm), RecycleCameraForm.class);
         RecycleCameraEntity entity = JsonUtil.getJsonToBean(recycleCameraForm, RecycleCameraEntity.class);
@@ -342,6 +339,7 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
     public List<RecycleCameraEntity> getByDeviceCode(String deviceCode) {
         QueryWrapper<RecycleCameraEntity> query = new QueryWrapper<>();
         query.lambda().eq(RecycleCameraEntity::getDeviceCode, deviceCode);
+        query.lambda().isNull(RecycleCameraEntity::getDeleteMark);
         return this.list(query);
     }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java

@@ -69,7 +69,6 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
      */
     @Override
     public List<SimCardEntity> getTypeList(SimCardPagination simCardPagination, String dataType) {
-        String userId = userProvider.get().getUserId();
         List<String> AllIdList = new ArrayList();
         List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -383,8 +382,6 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
     @Override
     @Transactional
     public void saveOrUpdate(SimCardForm simCardForm, String id, boolean isSave) throws Exception {
-        UserInfo userInfo = userProvider.get();
-        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         simCardForm = JsonUtil.getJsonToBean(
                 generaterSwapUtil.swapDatetime(SimCardConstant.getFormData(), simCardForm), SimCardForm.class);
         SimCardEntity entity = JsonUtil.getJsonToBean(simCardForm, SimCardEntity.class);
@@ -402,6 +399,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
     public SimCardEntity getByDeviceCode(String deviceCode) {
         QueryWrapper<SimCardEntity> query = new QueryWrapper<>();
         query.lambda().eq(SimCardEntity::getDeviceCode, deviceCode);
+        query.lambda().isNull(SimCardEntity::getDeleteMark);
         SimCardEntity simCard = this.getOne(query);
         return simCard;
     }