产业供地 当咨询时 同时填写问题和打钩时只显示填写的

pom.xml

@@ -39,16 +39,16 @@
         <httpclient.version>4.3.5</httpclient.version>
         <okhttp.version>3.8.0</okhttp.version>
         <druid-spring-boot.version>1.1.2</druid-spring-boot.version>
-        <feilong-platform.version>1.10.5</feilong-platform.version>
+        <!--<feilong-platform.version>1.10.5</feilong-platform.version>-->
         <jwt.version>0.7.0</jwt.version>
     </properties>
 
-    <repositories>
+    <!--<repositories>
         <repository>
             <id>feilong-repository</id>
             <url>https://raw.github.com/venusdrogon/feilong-platform/repository</url>
         </repository>
-    </repositories>
+    </repositories>-->
 
     <dependencies>
         <!--<dependency>-->

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -1260,7 +1260,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                    /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
@@ -1268,7 +1268,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                 break;
                             }
                         }
-                    }*/
+                    }
                     if (flag) {
                         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                         industrialLandSupplyConsultation.setIsDefault(true);
@@ -1378,7 +1378,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (departmentId != null && departmentId != "") {
                         boolean flag = true;
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                        /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                     industrialLandSupplyConsultation.setIsDefault(true);
@@ -1386,7 +1386,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                     break;
                                 }
                             }
-                        }*/
+                        }
                         if (flag) {
                             IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                             industrialLandSupplyConsultation.setIsDefault(true);
@@ -3383,7 +3383,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (departmentId != null) {
                         boolean flag = true;
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                        /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                                 if (industrialLandSupplyConsultation.getIsDefault() &&
                                         Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
@@ -3391,7 +3391,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                     flag = false;
                                 }
                             }
-                        }*/
+                        }
                         if (flag) {
                             IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                             industrialLandSupplyConsultation.setIsDefault(true);
@@ -3645,7 +3645,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                    /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
@@ -3653,7 +3653,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                 break;
                             }
                         }
-                    }*/
+                    }
                     if (flag) {
                         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                         industrialLandSupplyConsultation.setIsDefault(true);