ly 1 年間 前
コミット
ad51e554f8

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

@@ -285,7 +285,7 @@ public class BizCollectionController extends BaseController {
             detail.setInputRemark(l.getRemark());
             if(l.getTaskTypeId() == 4 && l.getBelongRegion()  != null){
                 SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
-                detail.setExplain( sysDictData.getDictLabel()+":");
+                detail.setExplain( sysDictData.getDictLabel());
             }
             if (!ObjectUtils.isEmpty(l.getAddressStyle()) && l.getAddressStyle() == 1 ){
                 if (StringUtils.isNotEmpty(detail.getExplain())){
@@ -295,6 +295,9 @@ public class BizCollectionController extends BaseController {
                 }
             }else {
                 SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                if (sysDictData== null) {
+                  return;
+                }
                 detail.setExplain(sysDictData.getDictLabel());
             }
             if(StringUtils.isNotEmpty(l.getRemark())) {
@@ -481,7 +484,7 @@ public class BizCollectionController extends BaseController {
             details.forEach(l -> {
                 if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
-                    l.setExplain( sysDictData.getDictLabel()+":");
+                    l.setExplain( sysDictData.getDictLabel());
                 }
                 if (!ObjectUtils.isEmpty(l.getAddressStyle()) && l.getAddressStyle() == 1 ){
                     if (StringUtils.isNotEmpty(l.getExplain())){
@@ -491,6 +494,9 @@ public class BizCollectionController extends BaseController {
                     }
                 }else {
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                    if (sysDictData== null) {
+                        return;
+                    }
                     l.setExplain(sysDictData.getDictLabel());
                 }
                 if(StringUtils.isNotEmpty(l.getInputRemark())) {

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

@@ -214,7 +214,7 @@ public class BizPaymentController extends BaseController {
         list.forEach(l -> {
             if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                 SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
-                l.setExplain( sysDictData.getDictLabel()+":");
+                l.setExplain( sysDictData.getDictLabel());
             }
             if (!ObjectUtils.isEmpty(l.getAddressStyle()) && l.getAddressStyle() == 1 ){
                 if (StringUtils.isNotEmpty(l.getExplain())){
@@ -224,6 +224,9 @@ public class BizPaymentController extends BaseController {
                 }
             }else {
                 SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                if (sysDictData != null){
+                    return;
+                }
                 l.setExplain(sysDictData.getDictLabel());
             }
             if(StringUtils.isNotEmpty(l.getRemark())) {
@@ -310,7 +313,7 @@ public class BizPaymentController extends BaseController {
             details.forEach(l -> {
                 if(l.getTaskTypeId() == 4 && l.getBelongRegion() != null){
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getBelongRegion().longValue());
-                    l.setExplain( sysDictData.getDictLabel()+":");
+                    l.setExplain( sysDictData.getDictLabel());
                 }
                 if (!ObjectUtils.isEmpty(l.getAddressStyle()) && l.getAddressStyle() == 1 ){
                     if (StringUtils.isNotEmpty(l.getExplain())){
@@ -320,6 +323,9 @@ public class BizPaymentController extends BaseController {
                     }
                 }else {
                     SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                    if (sysDictData== null) {
+                        return;
+                    }
                     l.setExplain(sysDictData.getDictLabel());
                 }
                 if(StringUtils.isNotEmpty(l.getInputRemark())) {