更新

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -10,6 +10,7 @@ import com.tykj.dev.device.allot.service.AllotBackBillService;
 import com.tykj.dev.device.allot.subject.domin.AllotBackBill;
 import com.tykj.dev.device.allot.subject.vo.AllotBillSelectVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
@@ -41,6 +42,9 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
     @Autowired
     private UserPublicService userPublicService;
 
+    @Autowired
+    private UserUtils userUtils;
+
     @Override
     public AllotBackBill addEntity(AllotBackBill allotBackBill) {
         AllotBackBill allotBackBill1 = allotBackBillDao.save(allotBackBill);
@@ -103,6 +107,10 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
 
     private Specification<AllotBackBill> getSelectSpecification(AllotBillSelectVo allotBillSelectVo) {
         PredicateBuilder<AllotBackBill> predicateBuilder = Specifications.and();
+        PredicateBuilder<AllotBackBill> predicateBuilder1 = Specifications.or();
+        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder.predicate(predicateBuilder1.build());
         if (allotBillSelectVo != null) {
             if (allotBillSelectVo.getReplayNumber() != null) {
                 predicateBuilder.eq("replayNumber", allotBillSelectVo.getReplayNumber());

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -10,6 +10,7 @@ import com.tykj.dev.device.allot.service.AllotBillService;
 import com.tykj.dev.device.allot.subject.domin.AllotBill;
 import com.tykj.dev.device.allot.subject.vo.AllotBillSelectVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -39,6 +40,9 @@ public class AllotBillServiceImpl implements AllotBillService {
     @Autowired
     private BlockChainUtil blockChainUtil;
 
+    @Autowired
+    private UserUtils userUtils;
+
     @Override
     public AllotBill addEntity(AllotBill allotBillEntity) {
         AllotBill allotBill = allotBillDao.save(allotBillEntity);
@@ -108,6 +112,10 @@ public class AllotBillServiceImpl implements AllotBillService {
 
     private Specification<AllotBill> getSelectSpecification(AllotBillSelectVo allotBillSelectVo) {
         PredicateBuilder<AllotBill> predicateBuilder = Specifications.and();
+        PredicateBuilder<AllotBill> predicateBuilder1 = Specifications.or();
+        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder.predicate(predicateBuilder1.build());
         if (allotBillSelectVo != null) {
             if (allotBillSelectVo.getReplayNumber() != null) {
                 predicateBuilder.eq("replayNumber", allotBillSelectVo.getReplayNumber());

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/DeviceInLibVo.java

@@ -34,7 +34,7 @@ public class DeviceInLibVo {
      */
     private int proofResult;
 
-    private int applyType;
+    private int invisibleRange;
 
     private int style;
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/DeviceNotInLibVo.java

@@ -35,7 +35,7 @@ public class DeviceNotInLibVo {
 
     private int status;
 
-    private int applyType;
+    private int invisibleRange;;
 
     private int style;
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -318,7 +318,7 @@ public class ObjTransUtil {
                 device.getRfidSurfaceId(),
                 device.getRfidCardId(),
                 proofResult,
-                packingLibrary.getApplyType(),
+                device.getInvisibleRange(),
                 packingLibrary.getStyle(),
                 device.getSecretLevel()
         );
@@ -337,7 +337,7 @@ public class ObjTransUtil {
                 device.getLocationUnit(),
                 device.getOwnUnit(),
                 device.getLifeStatus(),
-                packingLibrary.getApplyType(),
+                device.getInvisibleRange(),
                 packingLibrary.getStyle(),
                 device.getSecretLevel()
         );