|
@@ -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())) {
|