针对招商中心修改

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

@@ -283,7 +283,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         User user = userService.getUser(entity.getCreate_by());
         if (CommonUtils.isNotNull(user) && Constant.UserType.STREET.equals(user.getUser_type())) {
-            entity.setRecource(user.getStreet_name());
+            if(CommonUtils.isNotNull(user.getDepartment_name())){
+                entity.setRecource(user.getDepartment_name());
+            }else{
+                entity.setRecource(user.getStreet_name());
+            }
         } else if (CommonUtils.isNotNull(user) && Constant.UserType.GOVERNMENT.equals(user.getUser_type())) {
             entity.setRecource(user.getDepartment_name());
         }
@@ -722,7 +726,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
      * @Return: void
      **/
     @Transactional
-    public void save(IndustrialLandSupplyDetail apply, String status) throws Exception {
+    public void save(IndustrialLandSupplyDetail apply, String status) {
 
         Integer userType = ShiroUtils.getUserType();
         if (Objects.equals(status, Constant.PublishStatus.DRAFT)) {
@@ -1791,6 +1795,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
     public String userGroupType() {
 
         String str = "";
+        if(Constant.UserType.STREET.equals(ShiroUtils.getUserType())){
+            str += "0,";
+        }
         if (Constant.UserType.GOVERNMENT.equals(ShiroUtils.getUserType())) {
 
             Group group = null;

src/main/java/platform/modules/sys/shiro/AuthenticationRealm.java

@@ -91,6 +91,7 @@ public class AuthenticationRealm extends AuthorizingRealm {
                 throw new UnknownAccountException();
             }else */
             if (record.getUser_type().equals(Constant.UserType.GOVERNMENT)) {
+                //是否可以外网登录  在部门表中配置
                 if (!userService.isOutLogin(record)) {
                     throw new UnknownAccountException("");
                 }

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

@@ -70,27 +70,28 @@
             </div>
         </div>
 
-        <div class="line">项目信息补充</div>
-        <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-2"><span>补充信息：</span></label>
-            <div class="formControls col-xs-8 col-sm-9">
-                <div th:utext="${data.supplement}">
+        <th:block th:if="${detailType!='0'}">
+
+            <div class="line">项目信息补充</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>补充信息：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div th:utext="${data.supplement}">
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-2"><span>补充附件：</span></label>
-            <div class="formControls col-xs-8 col-sm-9">
-                <div class="uploader-list">
-                    <th:block th:unless="${data.supplement_file==null || data.supplement_file.file_url== null}">
-                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.supplement_file.file_url}"
-                           target="_blank">[[${data.supplement_file.file_name}]]</a>
-                    </th:block>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>补充附件：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div class="uploader-list">
+                        <th:block th:unless="${data.supplement_file==null || data.supplement_file.file_url== null}">
+                            <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.supplement_file.file_url}"
+                               target="_blank">[[${data.supplement_file.file_name}]]</a>
+                        </th:block>
+                    </div>
                 </div>
             </div>
-        </div>
 
-        <th:block th:if="${detailType!='0'}">
 
             <div class="line">咨询问题</div>
             <div class="row cl">
@@ -161,21 +162,21 @@
                         </tr>
                         </thead>
                         <tbody>
-<!--                        <tr class="text-c">-->
-<!--                            <td>商务局分管领导</td>-->
-<!--                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
-<!--                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
-<!--                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
-<!--                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
-<!--                            <td>-->
-<!--                                <th:block-->
-<!--                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
-<!--                                    <a style="color: #0c80fe;"-->
-<!--                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
-<!--                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
-<!--                                </th:block>-->
-<!--                            </td>-->
-<!--                        </tr>-->
+                        <!--                        <tr class="text-c">-->
+                        <!--                            <td>商务局分管领导</td>-->
+                        <!--                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+                        <!--                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+                        <!--                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+                        <!--                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+                        <!--                            <td>-->
+                        <!--                                <th:block-->
+                        <!--                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+                        <!--                                    <a style="color: #0c80fe;"-->
+                        <!--                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+                        <!--                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+                        <!--                                </th:block>-->
+                        <!--                            </td>-->
+                        <!--                        </tr>-->
                         <tr class="text-c">
                             <td>管委会分管领导</td>
                             <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -116,7 +116,7 @@
 
                     <th:block th:if="${type=='1'}">
 
-                        <th:block th:if="*{user_type=='0'}">
+                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'0')}">
 
                             <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
                                th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
@@ -124,15 +124,23 @@
 
                         </th:block>
 
-                        <th:block th:if="*{user_type=='4'}">
+                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'1')}">
 
-                            <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
-                               th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/commerce_approve/'+*{id}+'\');'"
-                               th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+                            <th:block th:if="*{user_type=='0'}">
 
-                        </th:block>
+                                <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
+                                   th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
+                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
 
-                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'1')}">
+                            </th:block>
+
+                            <th:block th:if="*{user_type=='4'}">
+
+                                <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
+                                   th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/commerce_approve/'+*{id}+'\');'"
+                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+
+                            </th:block>
 
                             <a title="审核" href="javascript:;" class="ml-5" style="text-decoration:none"
                                th:onclick="'javascript:jump_to(\'审核\',\'/land_supply/commerce_approve/'+*{id}+'\');'"