官网系统管理调整

src/main/java/com/jeeplus/modules/official/web/OfficialCategoryController.java

@@ -149,6 +149,10 @@ public class OfficialCategoryController extends BaseController {
                 }
                 officialCategory.setSort(String.valueOf(sortNum));
             }
+            //如果为1级或者二级
+            if("1".equals(officialCategory.getCateLevel()) || "2".equals(officialCategory.getCateLevel())){
+                officialCategory.setContentType("");
+            }
             categoryService.save(officialCategory);//保存
         }
         return "redirect:" + Global.getAdminPath() + "/official/category/?repage";

src/main/java/com/jeeplus/modules/official/web/OfficialInfoController.java

@@ -200,11 +200,11 @@ public class OfficialInfoController extends BaseController {
         } else {//新增表单保存
             if(StringUtils.isBlank(officialInfo.getSort())){
                 OfficialInfo maxSort = officialInfoService.findMaxSort(officialInfo);
-                int sortNum = 10;
+                int sortNum = 1;
                 if(maxSort != null){
                     sortNum = Integer.parseInt(maxSort.getSort() )+ 1 ;
                 }else{
-                    sortNum = 10;
+                    sortNum = 1;
                 }
                 officialInfo.setSort(String.valueOf(sortNum));
             }

src/main/webapp/webpage/modules/official/officialCategoryList.jsp

@@ -42,7 +42,8 @@
                 if ((${fns:jsGetVal('row.parentId')}) == pid) {
                     $(list).append(Mustache.render(tpl, {
                         dict: {
-                            display: getDictLabel(${fns:toJson(fns:getDictList('category_display'))}, row.display)
+                            display: getDictLabel(${fns:toJson(fns:getDictList('category_display'))}, row.display),
+                            contentType: getDictLabel(${fns:toJson(fns:getDictList('content_type'))}, row.contentType),
                         },
                         pid: (root ? 0 : pid),
                         row: row,
@@ -202,6 +203,7 @@
                         <th>分类名称</th>
                         <th>是否展示</th>
                         <th>排序</th>
+                        <th>内容类型</th>
                         <%--                        <th>创建人</th>--%>
                         <th>创建时间</th>
                         <shiro:hasPermission name="official:category:edit">
@@ -217,7 +219,7 @@
                         </td>
                         <td  style="text-align: center">{{dict.display}}</td>
                         <td  style="text-align: center">{{row.sort}}</td>
-                        <%--                        <td>{{row.createBy.name}}</td>--%>
+                        <td  style="text-align: center">{{dict.contentType}}</td>
                         <td  style="text-align: center">{{row.createDate}}</td>
                         <%--<td>禁用</td>--%>
                         <td class="op-td text-center">

src/main/webapp/webpage/modules/official/officialInfoForm.jsp

@@ -89,7 +89,7 @@
                 <div class="layui-item layui-col-sm12 lw12">
                     <label class="layui-form-label"><span class="require-item">*</span>分类名称：</label>
                     <div class="layui-input-block" style="display: flex;align-items: center">
-                        <span>${officialCategory.name}</span>
+                        <span>${officialCategory.parentName}-${officialCategory.name}</span>
                     </div>
                 </div>
 
@@ -102,10 +102,10 @@
                 </div>
 
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>关键词：</label>
+                    <label class="layui-form-label">关键词：</label>
                     <div class="layui-input-block">
                         <form:input path="keyword" placeholder="请输入关键词" htmlEscape="false"
-                                    class="form-control layui-input required"/>
+                                    class="form-control layui-input"/>
                     </div>
                 </div>