产业供地 分发步骤的修改，不再指定部门，而是在用户组内的全部接收到。

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

@@ -2208,7 +2208,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             //如果是政府业务员提交的 只给商务业务员发
             Integer createId = detail.getCreate_by();
             User creater = userService.getUser(createId);
-            if(!Objects.equals(creater.getUser_type(),Constant.UserType.GOVERNMENT)){
+            if (!Objects.equals(creater.getUser_type(), Constant.UserType.GOVERNMENT)) {
                 //如果不是政府账号创建 说明是街道提交 则给提交人也发短信
                 //发送短信
                 templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_YS;
@@ -2271,18 +2271,21 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         if (newApproval.getAfter_approvalstatus().equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_FEEDBACK)) {
                             List<IndustrialLandSupplyDistribution> ids = detail.getDistributionList();
                             for (IndustrialLandSupplyDistribution ilsc : ids) {
-                                if (Objects.equals(user.getDepartment_id() + "", ilsc.getDepartment_id())) {
-                                    sb.append(userGroup.getUser_id() + ",");
-                                    //发送短信
-                                    templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE;
-                                    int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
-                                    params.put("days", days + "");
-                                    try {
-                                        AlibabaSMSUtil.sendSMSMessage(
-                                                user.getPhone(), templateCode, Constant.SINGNAMW, JSONObject.toJSONString(params)
-                                        );
-                                    } catch (ClientException e) {
-                                        e.printStackTrace();
+                                if (Objects.equals(ilsc.getDepartment_id(), "0") ||
+                                        Objects.equals(user.getDepartment_id() + "", ilsc.getDepartment_id())) {
+                                    if (!sb.toString().contains(userGroup.getUser_id() + "")) {
+                                        sb.append(userGroup.getUser_id() + ",");
+                                        //发送短信
+                                        templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE;
+                                        int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
+                                        params.put("days", days + "");
+                                        try {
+                                            AlibabaSMSUtil.sendSMSMessage(
+                                                    user.getPhone(), templateCode, Constant.SINGNAMW, JSONObject.toJSONString(params)
+                                            );
+                                        } catch (ClientException e) {
+                                            e.printStackTrace();
+                                        }
                                     }
                                     break;
                                 }
@@ -2473,7 +2476,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             //如果是政府业务员提交的 只给商务业务员发
             Integer createId = detail.getCreate_by();
             User creater = userService.getUser(createId);
-            if(!Objects.equals(creater.getUser_type(),Constant.UserType.GOVERNMENT)){
+            if (!Objects.equals(creater.getUser_type(), Constant.UserType.GOVERNMENT)) {
                 //如果不是政府账号创建 说明是街道提交 则给提交人也发短信
                 //发送短信
                 templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_GD;
@@ -3653,9 +3656,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 //                    }
 //                }
 //            }
-            for (IndustrialLandSupplyDistribution industrialLandSupplyDistribution : industrialLandSupplyDistributionList) {
+            List<Department> departmentIds =  this.distDepartmentList();
 
-                industrialLandSupplyDistribution.setIndustrial_land_supply_id(id + "");
+            for (IndustrialLandSupplyDistribution industrialLandSupplyDistribution : industrialLandSupplyDistributionList) {
+                //注释了 现在只把department=0的这个公共文件给所有部门看
+              /*  industrialLandSupplyDistribution.setIndustrial_land_supply_id(id + "");
                 if (CommonUtils.isNull(industrialLandSupplyDistribution.getDistribute_time())) {
                     industrialLandSupplyDistribution.setDistribute_time(dateTime);
                 }
@@ -3664,9 +3669,32 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (null != industrialLandSupplyDistribution.getDistribution_file() && null != industrialLandSupplyDistribution.getDistribution_file().getFile_id()) {
                     attachmentService.deleteByBusiness(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE, industrialLandSupplyDistribution.getId());
                     attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE, industrialLandSupplyDistribution.getId(), industrialLandSupplyDistribution.getDistribution_file().getFile_id());
+                }*/
+                if (Objects.equals("0", industrialLandSupplyDistribution.getDepartment_id())) {
+                    Integer fileId = null;
+                    if (null != industrialLandSupplyDistribution.getDistribution_file() && null != industrialLandSupplyDistribution.getDistribution_file().getFile_id()) {
+                        fileId = industrialLandSupplyDistribution.getDistribution_file().getFile_id();
+                    }
+                    Attachment attachment = attachmentService.findById(fileId);
+                    for (Department department : departmentIds) {
+
+                        industrialLandSupplyDistribution.setId(null);
+                        industrialLandSupplyDistribution.setDepartment_id(department.getId()+"");
+                        industrialLandSupplyDistribution.setIndustrial_land_supply_id(id + "");
+                        if (CommonUtils.isNull(industrialLandSupplyDistribution.getDistribute_time())) {
+                            industrialLandSupplyDistribution.setDistribute_time(dateTime);
+                        }
+                        industrialLandSupplyDistributionService.saveSelective(industrialLandSupplyDistribution);
+
+                        attachment.setId(null);
+                        attachment.setBusiness_type(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE);
+                        attachment.setBusiness_id(industrialLandSupplyDistribution.getId());
+                        attachmentService.saveSelective(attachment);
+                    }
                 }
             }
         }
+
         //直接提交申请，添加流程信息
         pass(id, null);
         return id;

src/main/resources/templates/admin/government/industrial_land_supply/distribute.html

@@ -274,8 +274,9 @@
                 </table>
             </div>
         </div>
+        <!--注释了 现在只把department=0的这个公共文件给所有部门看-->
         <th:block th:each="item,itemStat : ${distDepartmentList}">
-            <div class="row cl" th:id="'department'+${item.id}">
+            <div hidden class="row cl" th:id="'department'+${item.id}">
                 <label class="form-label col-xs-4 col-sm-2"><span>[[${item.name}]]可见：</span></label>
                 <div class="formControls col-xs-8 col-sm-9">
                     <!--                    <div class="uploader-thum-container">-->