朱园亮 / xingyun-erp · Commits

Commit 689a631449ef28718ed2248280c43e3301f6ec10

Authored by 杨鸣坤
1 parent 604d908d

楚江ERP：报错问题修复

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
@@ -137,13 +137,13 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -137,13 +137,13 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
137 SysDept sysDept = sysDeptMap.get(contractDistributorStandard.getDeptId()); 137 SysDept sysDept = sysDeptMap.get(contractDistributorStandard.getDeptId());
138 Workshop workshop = workshopMap.get(contractDistributorStandard.getWorkshopId()); 138 Workshop workshop = workshopMap.get(contractDistributorStandard.getWorkshopId());
139 result.setContractCode(contractDistributorStandard.getCode()); 139 result.setContractCode(contractDistributorStandard.getCode());
140 - result.setDeptName(sysDept.getName()); 140 + result.setDeptName(sysDept == null ? "" : sysDept.getName());
141 result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate()); 141 result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate());
142 result.setOrderDate(contractDistributorStandard.getOrderDate()); 142 result.setOrderDate(contractDistributorStandard.getOrderDate());
143 - result.setCustomerName(customer.getName()); 143 + result.setCustomerName(customer == null ? "" : customer.getName());
144 result.setApprovalStatusName(auditName); 144 result.setApprovalStatusName(auditName);
145 result.setContractType(contractDistributorStandard.getType()); 145 result.setContractType(contractDistributorStandard.getType());
146 - result.setWorkshopName(workshop.getName()); 146 + result.setWorkshopName(workshop == null ? "" : workshop.getName());
147 result.setTotalQuantity(contractDistributorStandard.getTotalQuantity()); 147 result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
148 }); 148 });
149 149
@@ -175,13 +175,13 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -175,13 +175,13 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
175 SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(AUDIT_STATUS_DIC_CODE, result.getApprovalStatus()); 175 SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(AUDIT_STATUS_DIC_CODE, result.getApprovalStatus());
176 Workshop workshop = workshopService.findById(contractDistributorStandard.getWorkshopId()); 176 Workshop workshop = workshopService.findById(contractDistributorStandard.getWorkshopId());
177 result.setContractCode(contractDistributorStandard.getCode()); 177 result.setContractCode(contractDistributorStandard.getCode());
178 - result.setDeptName(sysDept.getName()); 178 + result.setDeptName(sysDept == null ? "" : sysDept.getName());
179 result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate()); 179 result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate());
180 result.setOrderDate(contractDistributorStandard.getOrderDate()); 180 result.setOrderDate(contractDistributorStandard.getOrderDate());
181 - result.setCustomerName(customer.getName()); 181 + result.setCustomerName(customer == null ? "" : customer.getName());
182 result.setApprovalStatusName(sysDataDicItem.getName()); 182 result.setApprovalStatusName(sysDataDicItem.getName());
183 result.setContractType(contractDistributorStandard.getType()); 183 result.setContractType(contractDistributorStandard.getType());
184 - result.setWorkshopName(workshop.getName()); 184 + result.setWorkshopName(workshop == null ? "" : workshop.getName());
185 result.setTotalQuantity(contractDistributorStandard.getTotalQuantity()); 185 result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
186 186
187 return InvokeResultBuilder.success(result); 187 return InvokeResultBuilder.success(result);