浏览代码

fix: 修复自有房产人均办公面积重复区县

weijianghai 11 月之前
父节点
当前提交
8249418bab

+ 2 - 2
src/main/java/com/example/controller/WzBuildManageDetailsController.java

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

+ 2 - 2
src/main/java/com/example/controller/WzBuildmanageAvageareaController.java

@@ -135,7 +135,7 @@ public class WzBuildmanageAvageareaController {
                 int i=0;
                 for (OtnAreaEntity otnAreaEntity : countyAreaList) {
                     for (WzBuildmanageAvageareaVo wzCity : countyList) {
-                        if (wzCity.getCity().contains(otnAreaEntity.getName())) {
+                        if (wzCity.getCity().equals(otnAreaEntity.getName())) {
                             i++;
                             wzCity.setFlag(i%2==0);
                             orderCountyList.add(wzCity);
@@ -163,7 +163,7 @@ public class WzBuildmanageAvageareaController {
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzBuildmanageAvageareaVo wzCity : cityList) {
-                if (wzCity.getCity().contains(otnAreaEntity.getName())) {
+                if (wzCity.getCity().equals(otnAreaEntity.getName())) {
                     wzCity.setFlag(i%2==0);
                     orderList.add(wzCity);
                     i++;