ly 1 ano atrás
pai
commit
2b2e0588e8

+ 1 - 1
src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -479,7 +479,7 @@ public class BizCollectionController extends BaseController {
             detailCondition.setCollectionId(collection.getId());
             List<BizCollectionDetail> details = collectionDetailService.getListByBean(detailCondition);
             details.forEach(l -> {
-                if(l.getTaskTypeId() == 4){
+                if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
                     l.setExplain( sysDictData.getDictLabel()+":");
                 }

+ 2 - 2
src/main/java/cn/ezhizao/project/business/payment/controller/BizPaymentController.java

@@ -212,7 +212,7 @@ public class BizPaymentController extends BaseController {
         startPage();
         List<BizArchiveInputDetail> list = contractDetailService.getList(condition);
         list.forEach(l -> {
-            if(l.getTaskTypeId() == 4){
+            if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                 SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
                 l.setExplain( sysDictData.getDictLabel()+":");
             }
@@ -308,7 +308,7 @@ public class BizPaymentController extends BaseController {
             detailCondition.setPaymentId(payment.getId());
             List<BizPaymentDetail> details = paymentDetailService.getListByBean(detailCondition);
             details.forEach(l -> {
-                if(l.getTaskTypeId() == 4){
+                if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
                     l.setExplain( sysDictData.getDictLabel()+":");
                 }