领导分工 修改

公安要闻权限放开

src/main/java/com/puboot/module/admin/controller/ArticleController.java

@@ -273,7 +273,7 @@ public class ArticleController {
                 //办公室
                 if (!office.getName().equals("办公室")) {
                     bizCategories.removeIf(
-                            x -> ("置顶要闻1、置顶要闻2、公安要闻、公安要闻-置顶").contains(x.getName())
+                            x -> ("置顶要闻1、置顶要闻2、公安要闻-置顶").contains(x.getName())
                     );
                 }
             }

src/main/java/com/puboot/module/blog/controller/AuditWebController.java

@@ -105,7 +105,7 @@ public class AuditWebController {
                         Comparator.comparing(
                                 BizLeader::getType))), ArrayList::new));
         bizLeaderList2.sort(Comparator.comparing(BizLeader::getTypeSort, Comparator.naturalOrder()));
-        bizLeaderList2.sort(Comparator.comparing(BizLeader::getSort, Comparator.naturalOrder()));
+//        bizLeaderList2.sort(Comparator.comparing(BizLeader::getSort, Comparator.naturalOrder()));
         Map<String, List<BizLeader>> stringListMap = new LinkedHashMap<>();;
         for (int i = 0; i < bizLeaderList2.size(); i++){
             BizLeader bizStarTemp = bizLeaderList2.get(i);

src/main/resources/templates/admin/leader/form.html

@@ -8,15 +8,15 @@
             <div class="invalid-feedback">请填写领导姓名</div>
         </div>
     </div>
-    <div class="form-group row">
-        <label for="num" class="col-sm-2 col-form-label">警号:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.num}" name="num" class="form-control"
-                   id="num"
-                   placeholder="请填写警号" required>
-            <div class="invalid-feedback">请填写警号</div>
-        </div>
-    </div>
+<!--    <div class="form-group row">-->
+<!--        <label for="num" class="col-sm-2 col-form-label">警号:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.num}" name="num" class="form-control"-->
+<!--                   id="num"-->
+<!--                   placeholder="请填写警号" required>-->
+<!--            <div class="invalid-feedback">请填写警号</div>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group row">
         <label for="post" class="col-sm-2 col-form-label">职务:</label>
         <div class="col-sm-10">
@@ -26,59 +26,59 @@
             <div class="invalid-feedback">请填写职务</div>
         </div>
     </div>
-    <div class="form-group row">
-        <label for="phoneNumber" class="col-sm-2 col-form-label">手机号:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.phoneNumber}" name="phoneNumber" class="form-control" id="phoneNumber" placeholder="填写手机号" required>
-            <div class="invalid-feedback">请填写职务</div>
-        </div>
-    </div>
+<!--    <div class="form-group row">-->
+<!--        <label for="phoneNumber" class="col-sm-2 col-form-label">手机号:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.phoneNumber}" name="phoneNumber" class="form-control" id="phoneNumber" placeholder="填写手机号" required>-->
+<!--            <div class="invalid-feedback">请填写职务</div>-->
+<!--        </div>-->
+<!--    </div>-->
 
-    <div class="form-group row">
-        <label for="seatNumber" class="col-sm-2 col-form-label">座机号:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.seatNumber}" name="seatNumber" class="form-control"
-                   id="seatNumber"
-                   placeholder="请填写座机号" required>
-            <div class="invalid-feedback">请填写座机号</div>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label for="office" class="col-sm-2 col-form-label">办公室:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.office}" name="office" class="form-control"
-                   id="office"
-                   placeholder="请填写办公室" required>
-            <div class="invalid-feedback">请填写办公室</div>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label for="office" class="col-sm-2 col-form-label">顺序:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.sort}" name="sort" class="form-control"
-                   id="sort"
-                   placeholder="请填写顺序" required>
-            <div class="invalid-feedback">请填写顺序</div>
-        </div>
-    </div>
+<!--    <div class="form-group row">-->
+<!--        <label for="seatNumber" class="col-sm-2 col-form-label">座机号:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.seatNumber}" name="seatNumber" class="form-control"-->
+<!--                   id="seatNumber"-->
+<!--                   placeholder="请填写座机号" required>-->
+<!--            <div class="invalid-feedback">请填写座机号</div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group row">-->
+<!--        <label for="office" class="col-sm-2 col-form-label">办公室:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.office}" name="office" class="form-control"-->
+<!--                   id="office"-->
+<!--                   placeholder="请填写办公室" required>-->
+<!--            <div class="invalid-feedback">请填写办公室</div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group row">-->
+<!--        <label for="office" class="col-sm-2 col-form-label">顺序:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.sort}" name="sort" class="form-control"-->
+<!--                   id="sort"-->
+<!--                   placeholder="请填写顺序" required>-->
+<!--            <div class="invalid-feedback">请填写顺序</div>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group row">
         <label for="responsibleForContent" class="col-sm-2 col-form-label">负责内容:</label>
         <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.responsibleForContent}" name="responsibleForContent" class="form-control"
+            <textarea  rows="5" th:text="${bizLeader?.responsibleForContent}" name="responsibleForContent" class="form-control"
                    id="responsibleForContent"
-                   placeholder="请填写负责内容" required>
+                       placeholder="请填写负责内容" required> </textarea>
             <div class="invalid-feedback">请填写负责内容</div>
         </div>
     </div>
-    <div class="form-group row">
-        <label for="departmentInCharge" class="col-sm-2 col-form-label">分管部门:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.departmentInCharge}" name="departmentInCharge" class="form-control"
-                   id="departmentInCharge"
-                   placeholder="请填写分管部门" required>
-            <div class="invalid-feedback">请填写分管部门</div>
-        </div>
-    </div>
+<!--    <div class="form-group row">-->
+<!--        <label for="departmentInCharge" class="col-sm-2 col-form-label">分管部门:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.departmentInCharge}" name="departmentInCharge" class="form-control"-->
+<!--                   id="departmentInCharge"-->
+<!--                   placeholder="请填写分管部门" required>-->
+<!--            <div class="invalid-feedback">请填写分管部门</div>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group row">
         <label for="type" class="col-sm-2 col-form-label">所属分类:</label>
         <div class="col-sm-10">
@@ -97,24 +97,24 @@
             <div class="invalid-feedback">请填写分类排序</div>
         </div>
     </div>
-    <div class="form-group row">
-        <label for="contactUnit" class="col-sm-2 col-form-label">联系单位:</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.contactUnit}" name="contactUnit" class="form-control"
-                   id="contactUnit"
-                   placeholder="请填写联系单位" required>
-            <div class="invalid-feedback">请填写联系单位</div>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label for="record" class="col-sm-2 col-form-label">简要介绍(履历):</label>
-        <div class="col-sm-10">
-            <input type="text" th:value="${bizLeader?.record}" name="record" class="form-control"
-                   id="record"
-                   placeholder="请填写简要介绍(履历)" required>
-            <div class="invalid-feedback">请填写简要介绍(履历)</div>
-        </div>
-    </div>
+<!--    <div class="form-group row">-->
+<!--        <label for="contactUnit" class="col-sm-2 col-form-label">联系单位:</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.contactUnit}" name="contactUnit" class="form-control"-->
+<!--                   id="contactUnit"-->
+<!--                   placeholder="请填写联系单位" required>-->
+<!--            <div class="invalid-feedback">请填写联系单位</div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group row">-->
+<!--        <label for="record" class="col-sm-2 col-form-label">简要介绍(履历):</label>-->
+<!--        <div class="col-sm-10">-->
+<!--            <input type="text" th:value="${bizLeader?.record}" name="record" class="form-control"-->
+<!--                   id="record"-->
+<!--                   placeholder="请填写简要介绍(履历)" required>-->
+<!--            <div class="invalid-feedback">请填写简要介绍(履历)</div>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group row">
         <label for="img" class="col-sm-2 col-form-label">图片:</label>
         <div class="col-sm-10" style="padding-right: 56px;position: relative;" >

src/main/resources/templates/admin/leader/list.html

@@ -114,53 +114,55 @@
                 title: '职务',
                 align: "center",
                 width: 200,
-            }, {
-                field: 'phoneNumber',
-                title: '手机号',
-                align: "center",
-                width: 200,
-            },
-            {
-                field: 'seatNumber',
-                title: '座机号',
-                align: "center",
-                width: 200,
-            },
-            {
-                field: 'office',
-                title: '办公室',
-                align: "center",
-                width: 200,
-            },
-            {
-                field: 'sort',
-                title: '顺序',
-                align: "center",
-                width: 100,
             },
+            // , {
+            //     field: 'phoneNumber',
+            //     title: '手机号',
+            //     align: "center",
+            //     width: 200,
+            // },
+            // {
+            //     field: 'seatNumber',
+            //     title: '座机号',
+            //     align: "center",
+            //     width: 200,
+            // },
+            // {
+            //     field: 'office',
+            //     title: '办公室',
+            //     align: "center",
+            //     width: 200,
+            // },
+            // {
+            //     field: 'sort',
+            //     title: '顺序',
+            //     align: "center",
+            //     width: 100,
+            // },
             {
                 field: 'responsibleForContent',
                 title: '负责内容',
                 align: "center",
                 width: 200,
-            }, {
-                field: 'departmentInCharge',
-                title: '分管部门',
-                align: "center",
-                width: 200,
             },
+            // , {
+            //     field: 'departmentInCharge',
+            //     title: '分管部门',
+            //     align: "center",
+            //     width: 200,
+            // },
             {
                 field: 'type',
                 title: '所属分类',
                 align: "center",
                 width: 200,
             },
-            {
-                field: 'typeSort',
-                title: '分类排序',
-                align: "center",
-                width: 200,
-            },
+            // {
+            //     field: 'typeSort',
+            //     title: '分类排序',
+            //     align: "center",
+            //     width: 200,
+            // },
 
 
             // {