From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml | 2 +-
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 10 ++++++++++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 5 +++++
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java | 8 ++++++++
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java | 7 +++++++
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java | 1 +
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java | 8 +++++++-
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java | 10 ++++++++++
8 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
index 1b94de8..8ffc3a8 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
@@ -87,6 +87,7 @@
/**
* 部门id
*/
+ @TableField("dept_id")
private String deptId;
/**
* 岗位id
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
index 875c19d..c22e1b9 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
@@ -46,6 +46,7 @@
String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
String SAVE_USER = API_PREFIX + "/save-user";
String REMOVE_USER = API_PREFIX + "/remove-user";
+ String SELUSERBYCODE = API_PREFIX + "/selUserByCode";
/**
* 获取用户信息
@@ -115,4 +116,11 @@
@PostMapping(REMOVE_USER)
R<Boolean> removeUser(@RequestParam("tenantIds") String tenantIds);
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @GetMapping(SELUSERBYCODE)
+ User selUserByCode(@RequestParam("code") String code);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
index 9e7cbff..5563832 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
@@ -26,7 +26,7 @@
<select id="getValue" resultType="java.lang.String">
select
dict_value
- from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0
+ from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0 limit 1
</select>
<!-- oracle 版本 -->
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
index 3e790ef..c6ae78d 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
@@ -85,4 +85,14 @@
return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));
}
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @Override
+ @GetMapping(SELUSERBYCODE)
+ public User selUserByCode(String code) {
+ return service.selUserByCode(code);
+ }
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
index 42c5e99..9f355db 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
@@ -23,7 +23,6 @@
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.vo.UsersVo;
-
import java.util.List;
/**
@@ -77,4 +76,11 @@
* @param page 分页
*/
List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+
+ /**
+ * 根据用户编号查询用户信息
+ * @param code 用户编号
+ * @return
+ */
+ User selUserByCode(String code);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index f902ee9..45f8c7a 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -170,4 +170,9 @@
</if>
order by bu.code asc
</select>
+
+ <!--根据用户编号查询用户信息-->
+ <select id="selUserByCode" resultType="org.springblade.system.user.entity.User">
+ select code,dept_id deptId from blade_user where is_deleted = 0 and code=#{code}
+ </select>
</mapper>
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index b325bb2..375f074 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -213,4 +213,11 @@
* @return
*/
IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
+
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ User selUserByCode(String code);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 1edc9f8..e8e2714 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -419,4 +419,14 @@
public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
}
+
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @Override
+ public User selUserByCode(String code) {
+ return baseMapper.selUserByCode(code);
+ }
}
--
Gitblit v1.9.3