|
@@ -606,7 +606,7 @@ public class WzBuildManageDetailsController {
|
|
int i=0;
|
|
int i=0;
|
|
for (OtnAreaEntity otnAreaEntity : countyAreaList) {
|
|
for (OtnAreaEntity otnAreaEntity : countyAreaList) {
|
|
for (WzBuildmanageAvageareaVo wzCity : countyList) {
|
|
for (WzBuildmanageAvageareaVo wzCity : countyList) {
|
|
- if (wzCity.getCity().contains(otnAreaEntity.getName())) {
|
|
|
|
|
|
+ if (wzCity.getCity().equals(otnAreaEntity.getName())) {
|
|
i++;
|
|
i++;
|
|
wzCity.setFlag(i%2==0);
|
|
wzCity.setFlag(i%2==0);
|
|
orderCountyList.add(wzCity);
|
|
orderCountyList.add(wzCity);
|
|
@@ -633,7 +633,7 @@ public class WzBuildManageDetailsController {
|
|
List<WzBuildmanageAvageareaVo> orderList = new ArrayList<>();
|
|
List<WzBuildmanageAvageareaVo> orderList = new ArrayList<>();
|
|
for (OtnAreaEntity otnAreaEntity : areaList) {
|
|
for (OtnAreaEntity otnAreaEntity : areaList) {
|
|
for (WzBuildmanageAvageareaVo wzCity : cityList) {
|
|
for (WzBuildmanageAvageareaVo wzCity : cityList) {
|
|
- if (wzCity.getCity().contains(otnAreaEntity.getName())) {
|
|
|
|
|
|
+ if (wzCity.getCity().equals(otnAreaEntity.getName())) {
|
|
orderList.add(wzCity);
|
|
orderList.add(wzCity);
|
|
}
|
|
}
|
|
}
|
|
}
|