Merge remote-tracking branch 'origin/dev_ui_upgrade' into develop

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java

@@ -166,11 +166,12 @@ public class CustomerFootBarController {
         List<CustomerFootBarEntity> footbars = customerFootBarService.listAllCustomerFootBars(customerId, appType);
         List<CustomerFootBarDTO> barDTOS = new LinkedList<>();
         footbars.forEach(barEntity -> {
-            CustomerFootBarEntity defaultFootBarEntity = customerFootBarService.getByAppTypeAndBarKeyOfCustomer("default", barEntity.getAppType(), barEntity.getBarKey());
-
             CustomerFootBarDTO barDTO = new CustomerFootBarDTO();
             BeanUtils.copyProperties(barEntity, barDTO);
-            barDTO.setDefaultBarName(defaultFootBarEntity.getBarName());
+            CustomerFootBarEntity defaultFootBarEntity = customerFootBarService.getByAppTypeAndBarKeyOfCustomer("default", barEntity.getAppType(), barEntity.getBarKey());
+            if(null!=defaultFootBarEntity){
+                barDTO.setDefaultBarName(defaultFootBarEntity.getBarName());
+            }
             barDTOS.add(barDTO);
         });
         return new Result<List<CustomerFootBarDTO>>().ok(barDTOS);

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java

@@ -200,11 +200,13 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
         }
         CustomerFootBarResultDTO dto = ConvertUtils.sourceToTarget(entity, CustomerFootBarResultDTO.class);
         CustomerFootBarEntity defaultBar = baseDao.getByAppTypeAndBarKeyOfCustomer("default", entity.getAppType(), entity.getBarKey());
-        dto.setDefaultBarName(defaultBar.getBarName());
+        if (null != defaultBar) {
-        dto.setDefaultIconPath(defaultBar.getIconPath());
+            dto.setDefaultBarName(defaultBar.getBarName());
-        dto.setDefaultSelectedIconPath(defaultBar.getSelectedIconPath());
+            dto.setDefaultIconPath(defaultBar.getIconPath());
-        dto.setDefaultPageTitle(defaultBar.getPageTitle());
+            dto.setDefaultSelectedIconPath(defaultBar.getSelectedIconPath());
-        dto.setDefaultFloatIconPath(defaultBar.getFloatIconPath());
+            dto.setDefaultPageTitle(defaultBar.getPageTitle());
+            dto.setDefaultFloatIconPath(defaultBar.getFloatIconPath());
+        }
         return dto;
     }