From c447386e06ce5927fb6e3ccb22ee673535b3f566 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 08 七月 2024 18:21:26 +0800
Subject: [PATCH] 标签增加部门字段、分页调整(未做权限)

---
 src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java |    4 +---
 src/main/java/com/mindskip/xzs/domain/vo/TagVO.java             |    4 +++-
 src/main/resources/mapper/TagMapper.xml                         |   14 ++++++++++++++
 src/main/java/com/mindskip/xzs/repository/TagMapper.java        |    4 ++++
 src/main/java/com/mindskip/xzs/domain/Tag.java                  |   10 +++++-----
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/domain/Tag.java b/src/main/java/com/mindskip/xzs/domain/Tag.java
index 0a42c20..72ddf27 100644
--- a/src/main/java/com/mindskip/xzs/domain/Tag.java
+++ b/src/main/java/com/mindskip/xzs/domain/Tag.java
@@ -1,9 +1,6 @@
 package com.mindskip.xzs.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,8 +18,11 @@
 
     private String name;
 
+    @TableField("dept_id")
+    private Integer deptId;
+
     @TableLogic
     private Boolean deleted;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/TagVO.java b/src/main/java/com/mindskip/xzs/domain/vo/TagVO.java
index d4e5fc2..e47e579 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/TagVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/TagVO.java
@@ -16,7 +16,9 @@
 
     private String name;
 
+    private String deptName;
+
     private Boolean deleted;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/mindskip/xzs/repository/TagMapper.java b/src/main/java/com/mindskip/xzs/repository/TagMapper.java
index a31095b..6f198e4 100644
--- a/src/main/java/com/mindskip/xzs/repository/TagMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/TagMapper.java
@@ -3,7 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mindskip.xzs.domain.Tag;
 import com.mindskip.xzs.domain.UserTag;
+import com.mindskip.xzs.domain.vo.TagVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,6 +27,8 @@
     List<String> selectTagNamesByUserId(Integer id);
 
     List<String> selectCountById(Integer id);
+
+    List<TagVO> page(@Param("tag") TagVO tag);
 }
 
 
diff --git a/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
index 9938353..4de1e2e 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
@@ -26,9 +26,7 @@
     @Override
     public PageInfo<Tag> tagPage(TagVO tag) {
         return PageHelper.startPage(tag.getPageIndex(), tag.getPageSize(), "id desc").doSelectPageInfo(() ->
-                new LambdaQueryChainWrapper<>(baseMapper)
-                        .like(StringUtils.hasText(tag.getName()), Tag::getName, tag.getName())
-                        .list()
+                 baseMapper.page(tag)
         );
     }
 
diff --git a/src/main/resources/mapper/TagMapper.xml b/src/main/resources/mapper/TagMapper.xml
index 4487b0a..b164ec9 100644
--- a/src/main/resources/mapper/TagMapper.xml
+++ b/src/main/resources/mapper/TagMapper.xml
@@ -32,4 +32,18 @@
         select user_name from t_user where id in (select user_id from t_user_tag where tag_id = #{id}) and deleted = 0
     </select>
 
+    <select id="page" resultType="com.mindskip.xzs.domain.vo.TagVO">
+        SELECT
+               tt.id, tt.name, td.name as deptName
+        FROM
+             t_tag tt
+                 INNER JOIN t_department td ON tt.dept_id = td.id
+        <where>
+            AND tt.deleted = 0
+            <if test="tag.name != null and tag.name != ''">
+                AND tt.name like concat('%', #{tag.name}, '%')
+            </if>
+        </where>
+    </select>
+
 </mapper>

--
Gitblit v1.8.0