diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 84af529..be0077a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 84af529..be0077a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7a53fd1..b411765 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-common - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 84af529..be0077a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7a53fd1..b411765 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-common - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index d64203e..6796ead 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -502,7 +502,9 @@ importList.forEach(i->{ i.setCheckDuplication(String.format("%s%s%s%s%s",i.getEquipmentName(),i.getModel(),i.getHelpInstruction(),i.getManufactureNo(),i.getManufacturer())); }); - List equipmentInfos = this.list(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_del","0"); + List equipmentInfos = this.list(queryWrapper); List unDuplicationResult = new ArrayList<>(); List hasExist = new ArrayList<>(); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 84af529..be0077a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7a53fd1..b411765 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-common - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index d64203e..6796ead 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -502,7 +502,9 @@ importList.forEach(i->{ i.setCheckDuplication(String.format("%s%s%s%s%s",i.getEquipmentName(),i.getModel(),i.getHelpInstruction(),i.getManufactureNo(),i.getManufacturer())); }); - List equipmentInfos = this.list(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_del","0"); + List equipmentInfos = this.list(queryWrapper); List unDuplicationResult = new ArrayList<>(); List hasExist = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java index 9251df5..43a3134 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java @@ -120,7 +120,8 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); DataScope dataScope = authService.getLoginUserDataScope(); if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds()) + .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds())); } if(ObjectUtil.isNotEmpty(positionId)){ queryWrapper.eq("position_id",positionId); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f244a34..bd64596 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 78f0483..f14fe2c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ca120ef..1af00ad 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-job - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0125f2c..6bf4fa4 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.8 + 1.2.0.9 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 84af529..be0077a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7a53fd1..b411765 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.8 + 1.2.0.9 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-model - 1.2.0.8 + 1.2.0.9 com.casic casic-metering-common - 1.2.0.8 + 1.2.0.9 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index d64203e..6796ead 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -502,7 +502,9 @@ importList.forEach(i->{ i.setCheckDuplication(String.format("%s%s%s%s%s",i.getEquipmentName(),i.getModel(),i.getHelpInstruction(),i.getManufactureNo(),i.getManufacturer())); }); - List equipmentInfos = this.list(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_del","0"); + List equipmentInfos = this.list(queryWrapper); List unDuplicationResult = new ArrayList<>(); List hasExist = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java index 9251df5..43a3134 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java @@ -120,7 +120,8 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); DataScope dataScope = authService.getLoginUserDataScope(); if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds()) + .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds())); } if(ObjectUtil.isNotEmpty(positionId)){ queryWrapper.eq("position_id",positionId); diff --git a/pom.xml b/pom.xml index 984614f..d15d2d7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.2.0.8 + 1.2.0.9 casic-metering-eqpt-xichang pom