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

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

@@ -1262,7 +1262,6 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                     if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                            industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
                                 flag = false;
@@ -1284,10 +1283,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-            /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                industrialLandSupplyConsultation.setIsDefault(false);
-                //industrialLandSupplyConsultation.setIsAgree(true);
-            }*/
+            for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                    industrialLandSupplyConsultation.setIsDefault(false);
+                }
+            }
             industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
         }
         //如果是发布，进提交流程
@@ -1381,7 +1381,6 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                                industrialLandSupplyConsultation.setIsDefault(false);
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                     industrialLandSupplyConsultation.setIsDefault(true);
                                     flag = false;
@@ -1402,9 +1401,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-                /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                    industrialLandSupplyConsultation.setIsDefault(false);
-                }*/
+                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                    if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                        industrialLandSupplyConsultation.setIsDefault(false);
+                    }
+                }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
         }
@@ -3387,7 +3388,6 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                                industrialLandSupplyConsultation.setIsDefault(false);
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                     industrialLandSupplyConsultation.setIsDefault(true);
                                     flag = false;
@@ -3407,9 +3407,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-                /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                    industrialLandSupplyConsultation.setIsDefault(false);
-                }*/
+                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                    if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                        industrialLandSupplyConsultation.setIsDefault(false);
+                    }
+                }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
             Approval approval = approvalService.getLatestApproval(apply.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
@@ -3649,7 +3651,6 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                     if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                            industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
                                 flag = false;
@@ -3670,9 +3671,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-            /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                industrialLandSupplyConsultation.setIsDefault(false);
-            }*/
+            for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                    industrialLandSupplyConsultation.setIsDefault(false);
+                }
+            }
             industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
         }
         //直接提交申请，添加流程信息