bug修复

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

@@ -1254,7 +1254,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 //2020-10-26 所有咨询都添加同意选框
                 if (!CollectionUtils.isEmpty(defaultList)) {
                     for (String departmentId : defaultList) {
-                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(),departmentId)) {
+                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
                             industrialLandSupplyConsultation.setIsDefault(true);
                         }
                     }
@@ -1369,7 +1369,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 //2020-10-26 所有咨询都添加同意选框
                 if (!CollectionUtils.isEmpty(defaultList)) {
                     for (String departmentId : defaultList) {
-                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(),departmentId)) {
+                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
                             industrialLandSupplyConsultation.setIsDefault(true);
                         }
                     }
@@ -3417,6 +3417,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     it.remove();
                 }
             }
+            if (CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                return;
+            }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
@@ -3430,7 +3433,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 q.setDepartment_id(industrialLandSupplyConsultation.getDepartment_id());
                 q.setIndustrial_land_supply_id(industrialLandSupplyConsultation.getIndustrial_land_supply_id());
                 List<IndustrialLandSupplyConsultation> dl = industrialLandSupplyConsultationService.findListByWhere(q);
-                if(CommonUtils.isNotNull(dl)){
+                if (CommonUtils.isNotNull(dl)) {
                     industrialLandSupplyConsultation.setIsDefault(true);
                 }
             }
@@ -3538,7 +3541,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (CommonUtils.isNotNull(list)) {
                         industrialLandSupplyConsultation.setIsDefault(true);
                         //for (IndustrialLandSupplyConsultation landSupplyConsultation : list) {
-                            //industrialLandSupplyConsultationService.deleteById(landSupplyConsultation.getId());
+                        //industrialLandSupplyConsultationService.deleteById(landSupplyConsultation.getId());
                         //}
                     }
                 }