From d5bcee72966455366427364911b55b365bc5a466 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 25 Dec 2020 17:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/benyi/news/index.vue       | 34 ++++---
 .../src/views/benyi/newsapproval/index.vue    | 93 ++++++++-----------
 .../controller/BySchoolNewsController.java    | 11 ++-
 3 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/news/index.vue b/ruoyi-ui/src/views/benyi/news/index.vue
index 3d1c711f2..53ef5a0fd 100644
--- a/ruoyi-ui/src/views/benyi/news/index.vue
+++ b/ruoyi-ui/src/views/benyi/news/index.vue
@@ -46,7 +46,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -56,7 +56,7 @@
           v-hasPermi="['benyi:news:edit']"
           >修改</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -88,7 +88,6 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="摘要" align="center" prop="abstractcontent" />
       <el-table-column
         label="类型"
         align="center"
@@ -130,6 +129,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['benyi:news:edit']"
+            v-show="isShow(scope.row)"
             >修改</el-button
           >
           <el-button
@@ -154,7 +154,7 @@
 
     <!-- 添加或修改新闻中心对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1024px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="标题" prop="title">
           <el-input
             v-model="form.title"
@@ -162,13 +162,6 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <el-form-item label="摘要" prop="abstractcontent">
-          <el-input
-            v-model="form.abstractcontent"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
         <!-- <el-form-item label="类型">
           <el-select v-model="form.type" placeholder="请选择类型">
             <el-option
@@ -212,6 +205,7 @@ export default {
   },
   data() {
     return {
+      
       // 遮罩层
       loading: true,
       // 选中数组
@@ -260,7 +254,14 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "内容不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -276,11 +277,18 @@ export default {
     this.getDicts("sys_yes_no").then((response) => {
       this.istopOptions = response.data;
     });
-    this.getDicts("sys_yes_no").then((response) => {
+    this.getDicts("sys_dm_ischeck").then((response) => {
       this.ischeckOptions = response.data;
     });
   },
   methods: {
+    isShow(row) {
+      if (row.ischeck == "1") {
+        return false;
+      } else {
+        return true;
+      }
+    },
     /** 查询新闻中心列表 */
     getList() {
       this.loading = true;
diff --git a/ruoyi-ui/src/views/benyi/newsapproval/index.vue b/ruoyi-ui/src/views/benyi/newsapproval/index.vue
index 8a4ea1f65..d2bf3810a 100644
--- a/ruoyi-ui/src/views/benyi/newsapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/newsapproval/index.vue
@@ -71,7 +71,6 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="摘要" align="center" prop="abstractcontent" />
       <el-table-column
         label="类型"
         align="center"
@@ -88,12 +87,6 @@
           <div v-html="scope.row.content"></div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建人"
-        align="center"
-        prop="createuserid"
-        :formatter="userFormat"
-      />
       <el-table-column
         label="所属学校"
         align="center"
@@ -101,7 +94,7 @@
         :formatter="deptFormat"
       />
       <el-table-column
-        label="是否审核"
+        label="审核状态"
         align="center"
         prop="ischeck"
         :formatter="ischeckFormat"
@@ -158,41 +151,26 @@
       width="1024px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="标题" prop="title">
           <el-input
             v-model="form.title"
             type="textarea"
             placeholder="请输入内容"
-            :disabled="true"
           />
         </el-form-item>
-        <el-form-item label="摘要" prop="abstractcontent">
-          <el-input
-            v-model="form.abstractcontent"
-            type="textarea"
-            placeholder="请输入内容"
-            :disabled="true"
-          />
-        </el-form-item>
-        <!-- <el-form-item label="类型">
-          <el-select v-model="form.type" placeholder="请选择类型">
-            <el-option
-              v-for="dict in typeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="内容" prop="content" >
           <Editor v-model="form.content" placeholder="请输入内容"  />
         </el-form-item>
-        <el-form-item label="是否审批通过" prop="ischeck">
-          <el-radio-group v-model="form.ischeck">
-            <el-radio label="Y">是</el-radio>
-            <el-radio label="N">否</el-radio>
-          </el-radio-group>
+        <el-form-item label="审核状态" prop="ischeck">
+          <el-select v-model="form.ischeck" placeholder="请选择审核状态">
+            <el-option
+              v-for="dict in ischeckOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -215,7 +193,7 @@ import {
 
 import Editor from "@/components/Editor";
 import { listDept, getDept } from "@/api/system/dept";
-import { listUser, getUser } from "@/api/system/user";
+// import { listUser, getUser } from "@/api/system/user";
 
 export default {
   name: "News",
@@ -265,7 +243,7 @@ export default {
         createuserid: undefined,
         deptId: undefined,
         istop: undefined,
-        ischeck: "N",
+        ischeck: "0",
         checkuserid: undefined,
         checkTime: undefined,
       },
@@ -276,13 +254,18 @@ export default {
         ischeck: [
           { required: true, message: "审批意见不能为空", trigger: "blur" },
         ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "内容不能为空", trigger: "blur" },
+        ],
       },
     };
   },
   created() {
     this.getList();
     this.getDeptList();
-    this.getUserList();
     this.getDicts("sys_dm_newstype").then((response) => {
       this.typeOptions = response.data;
     });
@@ -292,7 +275,7 @@ export default {
     this.getDicts("sys_yes_no").then((response) => {
       this.istopOptions = response.data;
     });
-    this.getDicts("sys_yes_no").then((response) => {
+    this.getDicts("sys_dm_ischeck").then((response) => {
       this.ischeckOptions = response.data;
     });
   },
@@ -313,11 +296,11 @@ export default {
       });
     },
     // 用户列表
-    getUserList() {
-      listUser(null).then((response) => {
-        this.userOptions = response.rows;
-      });
-    },
+    // getUserList() {
+    //   listUser(null).then((response) => {
+    //     this.userOptions = response.rows;
+    //   });
+    // },
     // 字典翻译
     deptFormat(row, column) {
       var actions = [];
@@ -331,18 +314,18 @@ export default {
       return actions.join("");
     },
     // 字典翻译
-    userFormat(row, column) {
-      // return this.selectDictLabel(this.classOptions, row.classid);
-      var actions = [];
-      var datas = this.userOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].userId == "" + row.createuserid) {
-          actions.push(datas[key].nickName);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
+    // userFormat(row, column) {
+    //   // return this.selectDictLabel(this.classOptions, row.classid);
+    //   var actions = [];
+    //   var datas = this.userOptions;
+    //   Object.keys(datas).map((key) => {
+    //     if (datas[key].userId == "" + row.createuserid) {
+    //       actions.push(datas[key].nickName);
+    //       return false;
+    //     }
+    //   });
+    //   return actions.join("");
+    // },
     // 类型字典翻译
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.type);
@@ -416,8 +399,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != undefined) {
-            var now = new Date();
-            this.form.checkTime = now.toLocaleDateString();
             updateNews(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("审批成功");
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolNewsController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolNewsController.java
index 22e5bb63f..2e3ed99bd 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolNewsController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolNewsController.java
@@ -35,8 +35,6 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 public class BySchoolNewsController extends BaseController {
     @Autowired
     private IBySchoolNewsService bySchoolNewsService;
-    @Autowired
-    private SchoolCommon schoolCommon;
 
     /**
      * 查询新闻中心列表
@@ -91,7 +89,14 @@ public class BySchoolNewsController extends BaseController {
     @Log(title = "新闻中心", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BySchoolNews bySchoolNews) {
-        return toAjax(bySchoolNewsService.updateBySchoolNews(bySchoolNews));
+        if (bySchoolNews.getIscheck().equals("0")) {
+            return toAjax(bySchoolNewsService.updateBySchoolNews(bySchoolNews));
+        }else {
+            bySchoolNews.setCheckTime(new Date());
+            return toAjax(bySchoolNewsService.updateBySchoolNews(bySchoolNews));
+        }
+
+
     }
 
     /**