[列装模块]修改列装没按可见范围查询Bug

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java

@@ -143,6 +143,7 @@ public class PackingLibraryController {
                     if (packingLibraryEntity.getIsPart() == 1 && packingLibraryEntity.getPartParentId().equals(packingEditVo.getPackingId())) {
                         packingLibraryEntity.setPartParentId(null);
                         packingLibraryService.update(packingLibraryEntity);
+                        packingLibraryService.delete(packingLibraryEntity.getId());
                     }
                 }
             }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -6,6 +6,7 @@ import com.tykj.dev.device.packing.repository.PackingLibraryDao;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.packing.subject.vo.PackingLibrarySelectVo;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.ResultUtil;
@@ -29,6 +30,9 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     @Autowired
     private PackingLibraryDao packingLibraryDao;
 
+    @Autowired
+    private UserUtils userUtils;
+
     @Override
     public PackingLibrary addEntity(PackingLibrary packingLibraryEntity) {
         return packingLibraryDao.save(packingLibraryEntity);
@@ -143,6 +147,13 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
 
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        Integer level = userUtils.getCurrentUnitLevel();
+        if (level==2){
+            predicateBuilder.in("invisibleRange",new Integer[]{2,3});
+        }
+        if (level==3){
+            predicateBuilder.eq("invisibleRange",3);
+        }
         if (packingLibrarySelectVo != null) {
             if (packingLibrarySelectVo.getContent() != null) {
                 Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
@@ -183,6 +194,13 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
 
     private Specification<PackingLibrary> getSelectSpecification2(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        Integer level = userUtils.getCurrentUnitLevel();
+        if (level==2){
+            predicateBuilder.in("invisibleRange",new Integer[]{2,3});
+        }
+        if (level==3){
+            predicateBuilder.eq("invisibleRange",3);
+        }
         if (packingLibrarySelectVo != null) {
             if (packingLibrarySelectVo.getContent() != null) {
                 Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
@@ -236,7 +254,14 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     }
 
     private Specification<PackingLibrary> getSelectSpecification5(PackingLibrarySelectVo packingLibrarySelectVo) {
+        Integer level = userUtils.getCurrentUnitLevel();
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        if (level==2){
+            predicateBuilder.in("invisibleRange",new Integer[]{2,3});
+        }
+        if (level==3){
+            predicateBuilder.eq("invisibleRange",3);
+        }
         if (packingLibrarySelectVo != null) {
             if (packingLibrarySelectVo.getContent() != null) {
                 Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;