47-产业供地-商务局审批页面，只勾选“请反馈意见 ”，不添加其他内容时，提交“保存失败”

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

@@ -1224,11 +1224,13 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             for (String departmentId : defaultList) {
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
-                    for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                        if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
-                            industrialLandSupplyConsultation.setIsDefault(true);
-                            flag = false;
-                            break;
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                            if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
+                                industrialLandSupplyConsultation.setIsDefault(true);
+                                flag = false;
+                                break;
+                            }
                         }
                     }
                     if (flag) {
@@ -1334,11 +1336,13 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 for (String departmentId : defaultList) {
                     if (departmentId != null && departmentId != "") {
                         boolean flag = true;
-                        for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                            if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
-                                industrialLandSupplyConsultation.setIsDefault(true);
-                                flag = false;
-                                break;
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                            for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                                if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
+                                    industrialLandSupplyConsultation.setIsDefault(true);
+                                    flag = false;
+                                    break;
+                                }
                             }
                         }
                         if (flag) {
@@ -3330,19 +3334,16 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             //保存默认咨询列表
             List<String> defaultList = apply.getDefaultList();
             if (!CollectionUtils.isEmpty(defaultList)) {
-                IndustrialLandSupplyConsultation query = new IndustrialLandSupplyConsultation();
-                query.setIndustrial_land_supply_id(apply.getId() + "");
-                query.setDel_flag(false);
-//                List<IndustrialLandSupplyConsultation> oldList = industrialLandSupplyConsultationService.findListByWhere(query);
                 for (String departmentId : defaultList) {
                     if (departmentId != null) {
                         boolean flag = true;
-//                        for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : oldList) {
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                            if (industrialLandSupplyConsultation.getIsDefault() &&
-                                    Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
-                                industrialLandSupplyConsultation.setIsDefault(true);
-                                flag = false;
+                                if (industrialLandSupplyConsultation.getIsDefault() &&
+                                        Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
+                                    industrialLandSupplyConsultation.setIsDefault(true);
+                                    flag = false;
+                                }
                             }
                         }
                         if (flag) {
@@ -3591,11 +3592,13 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             for (String departmentId : defaultList) {
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
-                    for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                        if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
-                            industrialLandSupplyConsultation.setIsDefault(true);
-                            flag = false;
-                            break;
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                            if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
+                                industrialLandSupplyConsultation.setIsDefault(true);
+                                flag = false;
+                                break;
+                            }
                         }
                     }
                     if (flag) {