From 2bdecf28a44019b125fe8e62a8ee4ea114418eea Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 14:09:15 +0800
Subject: [PATCH] 权限修改4.0
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 3 +++
user-server/src/main/resources/mapper/UserMapper.xml | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index d8e38a1..9dcdc60 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "涓�х鍚�")
private String info;
+ @ApiModelProperty(value = "绫诲瀷")
+ private Integer type;
+
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
private Integer jobState;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index a30ccda..75791a6 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -96,7 +96,7 @@
@Override
public List<Map<String, Object>> getUserNameAndId() {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
+ wrapper.select(User::getId, User::getName).eq(User::getType,1);
return userMapper.selectMaps(wrapper);
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 748e1ca..6a87908 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -15,11 +15,13 @@
`user` u
WHERE e.`id` = u.`enterprise_id`
AND u.id = #{userId}
+ and type = 1
</select>
<select id="getNewPersonnelPage" resultType="map">
- SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime, u.`age`,
+ SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
+ u.`age`,
u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
--
Gitblit v1.9.3