jz.kai vor 2 Jahren
Ursprung
Commit
4d20d706b3

+ 16 - 5
web/src/main/java/com/jpsoft/excellent/modules/base/controller/FeedbackOpinionController.java

@@ -369,13 +369,10 @@ public class FeedbackOpinionController {
             searchParams.put("reportDateEnd",sdf.format(calendar.getTime()));
         }
 
-
-
         Page<FeedbackOpinion> page = feedbackOpinionService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(FeedbackOpinion feedbackOpinion : page.getResult()){
-            Area area = areaService.get(feedbackOpinion.getAreaId());
-            if(area != null) {
-                feedbackOpinion.setAreaName(area.getName());
+            if(StringUtils.isNotEmpty(feedbackOpinion.getAreaId())) {
+                feedbackOpinion.setAreaName(parentFullName(feedbackOpinion.getAreaId()));
             }
         }
 
@@ -814,4 +811,18 @@ public class FeedbackOpinionController {
 
         return downloadUrl;
     }
+
+    private String parentFullName(String parentId){
+        String fullName = "";
+
+        Area area = areaService.get(parentId);
+        if(StringUtils.isNotEmpty(area.getParentId())){
+            fullName = parentFullName(area.getParentId()) + "-" + area.getName();
+        }
+        else {
+            fullName = area.getName();
+        }
+
+        return fullName;
+    }
 }