From cfa67cf608ec0a75db07a8f47679aa2ad44c1126 Mon Sep 17 00:00:00 2001
From: ggb <1223416496@qq.com>
Date: Thu, 8 Jun 2023 18:34:35 +0800
Subject: [PATCH] Modifying search function bugs in work management

---
 .../pinnacle/controller/WorkController.java   |  5 ++++-
 Pinnacle/src/main/resources/application.yml   |  4 ----
 .../src/main/resources/mapper/WorkMapper.xml  |  8 ++++++--
 ui/src/pages/work/Manage.vue                  | 19 +++++++++++++------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
index 47057fb..f0de6e2 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
@@ -31,10 +31,13 @@ public class WorkController {
     @GetMapping
     @PreAuthorize("hasAuthority('work:manage:get')")
     public ResponseResult<List<Work>> getAll(String content) {
-        if (content != null) {
+        System.out.println(content);
+        if (content != null && content.length() != 0) {
+            System.out.println("test1");
             List<Work> workList = workService.getWorkByContent(content);
             return ResponseResult.databaseSelectSuccess(workList);
         } else {
+            System.out.println("test2");
             return ResponseResult.databaseSelectSuccess(workService.getAll());
         }
     }
diff --git a/Pinnacle/src/main/resources/application.yml b/Pinnacle/src/main/resources/application.yml
index 52b1492..5d2e118 100644
--- a/Pinnacle/src/main/resources/application.yml
+++ b/Pinnacle/src/main/resources/application.yml
@@ -18,7 +18,3 @@ mybatis-plus:
   type-aliases-package: com.cfive.pinnacle.entity
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-logging:
-  level:
-    root: debug
\ No newline at end of file
diff --git a/Pinnacle/src/main/resources/mapper/WorkMapper.xml b/Pinnacle/src/main/resources/mapper/WorkMapper.xml
index 9d212b6..87926f5 100644
--- a/Pinnacle/src/main/resources/mapper/WorkMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/WorkMapper.xml
@@ -76,14 +76,18 @@
                tuw.user_id       worker_id,
                tu.username        worker_name,
                tuw.status        status,
-               tuw.complete_time completeTime
+               tuw.complete_time completeTime,
+               first_name,
+               last_name
         from t_work w
                  left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
                  left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
                  left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
+                 left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
         where w.content like '%${content}%'
           and w.deleted = 0
-          and w.old = 0;
+          and w.old = 0
+        order by w.id desc;
     </select>
     <select id="getTodo" parameterType="long" resultMap="workMap">
         select w.id,
diff --git a/ui/src/pages/work/Manage.vue b/ui/src/pages/work/Manage.vue
index d0cfd2d..2b4596b 100644
--- a/ui/src/pages/work/Manage.vue
+++ b/ui/src/pages/work/Manage.vue
@@ -11,7 +11,12 @@
             </el-col>
             <el-col :span="1" />
             <el-col :span="3">
-                <el-button size="default" type="primary" @click="searchByContent">搜索</el-button>
+                <el-button
+                    size="default"
+                    type="primary"
+                    @click="searchByContent(this.searchContent.trim())"
+                    >搜索</el-button
+                >
             </el-col>
             <el-col :span="3">
                 <el-button size="default" @click="addVisible = true">添加</el-button>
@@ -112,6 +117,7 @@
 </template>
 
 <script lang="ts">
+import _ from 'lodash'
 import request from '@/services'
 import EditWork from '@/components/work/EditWork.vue'
 import { ElMessage } from 'element-plus'
@@ -131,7 +137,7 @@ export default {
             addVisible: false,
             editVisible: false,
             loading: true,
-            searchContent: '',
+            searchContent: null,
             workers: []
         }
     },
@@ -150,7 +156,7 @@ export default {
             request.get('/work').then((res) => {
                 const response = res.data
                 if (response.code === DATABASE_SELECT_OK) {
-                    this.tableData = response.data
+                    this.tableData = _.cloneDeep(response.data)
                     if (this.tableData) {
                         this.loading = false
                     }
@@ -219,11 +225,12 @@ export default {
         formatDate(time) {
             return new Date(time).toLocaleString()
         },
-        searchByContent() {
-            request.get('/work', { content: this.searchContent.trim() }).then((res) => {
+        searchByContent(content) {
+            request.get('/work', { content }).then((res) => {
                 const response = res.data
                 if (response.code === DATABASE_SELECT_OK) {
-                    this.tableData = response.data
+                    this.tableData = _.cloneDeep(response.data)
+                    console.log(this.tableData)
                     if (this.tableData) {
                         this.loading = false
                     }