From 6fae8bed3321996325927f5423d8df670a895aaa Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 17 十月 2022 22:58:33 +0800
Subject: [PATCH] 部门bug修改
---
ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java | 2 +-
ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java | 3 +++
ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml | 2 +-
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 4 +++-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java b/ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java
index c603394..5c33944 100644
--- a/ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java
+++ b/ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java
@@ -19,4 +19,7 @@
private Long userId;
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
private String username;
+
+ @ApiModelProperty("鏄惁涓洪瀵�")
+ private Boolean leader;
}
diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java b/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java
index acbf209..8e584c1 100644
--- a/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java
+++ b/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java
@@ -59,7 +59,7 @@
* 鏄惁鏄瀵�
*/
@TableField("is_leader")
- private Integer isLeader;
+ private Boolean leader;
}
diff --git a/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml b/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml
index 1b425d7..167d2db 100644
--- a/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml
@@ -9,7 +9,7 @@
<result column="depart_id" property="departId" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="is_leader" property="isLeader" />
+ <result column="is_leader" property="leader" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
diff --git a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
index a477ce2..f42ee1d 100644
--- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -26,6 +26,7 @@
<collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
<id column="user_id" property="userId"/>
<result column="username" property="username"/>
+ <result column="is_leader" property="leader" jdbcType="BOOLEAN"></result>
</collection>
</resultMap>
@@ -36,12 +37,13 @@
FROM ums_depart ud
LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id
LEFT JOIN ums_admin ua ON udm.user_id = ua.id
+ where ud.is_deleted = 0
</select>
<select id="selectPageByName" resultMap="DepartVOMap">
SELECT t_0.*,
ua.id user_id,
ua.username,
- dd.`name` as depart_type_name
+ dd.`name` as depart_type_name,udm.is_leader
FROM (
SELECT ud.*
FROM ums_depart ud
--
Gitblit v1.8.0