Ver Fonte

no message

ly há 1 ano atrás
pai
commit
e559cd822a

+ 12 - 3
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -16,6 +17,7 @@ import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderDetailService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
+import cn.ezhizao.project.system.domain.SysDictData;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
 import cn.ezhizao.project.system.service.ISysDictDataService;
@@ -59,13 +61,20 @@ public class OnceWorkOrderProductionController extends BaseController {
             if(style ==null){
                 return;
             }
-            if (v.getTaskTypeId() == 5L && style == 1){
+            if (v.getTaskTypeId() == 5L && style == 1 && StringUtils.isNotEmpty(v.getInputProvince()) ){
                 //自有地址
                 v.setExplain("自有地址:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
-            }else if (v.getTaskTypeId() == 5L && style == 2){
+            }else if (v.getTaskTypeId() == 5L && style == 2 && v.getFictionAddressId() != null){
                 //虚拟地址
-                v.setExplain("虚拟地址:"+sysDictDataService.selectDictDataById(v.getFictionAddressId()).getDictLabel());
+                SysDictData sysDictData = sysDictDataService.selectDictDataById(v.getFictionAddressId());
+                if(sysDictData == null){
+                    return;
+                }
+                v.setExplain("虚拟地址:"+sysDictData.getDictLabel());
             }else {
+                if (StringUtils.isEmpty(v.getInputProvince())){
+                    return;
+                }
                 v.setExplain("办理地区:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
             }