Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -143,6 +143,9 @@ public class AgencyServiceImpl implements AgencyService {
                         subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue());
                     }else {
                         subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue());
+                        if (null == subAgency){
+                            subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COLON + sub.getValue());
+                        }
                     }
                     sub.setChildren(subAgency);
                 }
@@ -176,6 +179,9 @@ public class AgencyServiceImpl implements AgencyService {
                          subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COMMA + sub.getValue());
                     }else {
                         subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COLON + sub.getValue());
+                        if (null == subAgency){
+                            subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COLON + sub.getValue());
+                        }
                     }
                     sub.setChildren(subAgency);
                 }