|
@@ -430,12 +430,12 @@ public class ManagerController extends BaseController {
|
|
|
responseRenovationPartsDetailManager.setTypeName(renovationPartsEntity.getDescription() + " > " + renovationPartsTypeEntity.getDescription());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- RenovationPartsColorEntity renovationPartsColorEntity = renovationPartsColorService.findById(renovationPartsDetailEntity.getPartsColorId());
|
|
|
- if (renovationPartsColorEntity != null) {
|
|
|
- responseRenovationPartsDetailManager.setColorName(renovationPartsColorEntity.getColorName());
|
|
|
+ if (ObjectUtil.isNotNull(renovationPartsDetailEntity.getPartsColorId())) {
|
|
|
+ RenovationPartsColorEntity renovationPartsColorEntity = renovationPartsColorService.findById(renovationPartsDetailEntity.getPartsColorId());
|
|
|
+ if (renovationPartsColorEntity != null) {
|
|
|
+ responseRenovationPartsDetailManager.setColorName(renovationPartsColorEntity.getColorName());
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
ResponseRenovationPartsAttaching responseRenovationPartsAttaching = renovationPartsAttachingService.findAttachinByDetailId(renovationPartsDetailEntity.getId());
|
|
|
if (responseRenovationPartsAttaching != null) {
|
|
|
if (responseRenovationPartsAttaching.isWallAttaching()) {
|