From 61cfb19a3864e70cedaa8de38f4caf032f528455 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 06 May 2022 09:35:54 +0800
Subject: [PATCH] 新增查询保安员证编号,新增 ftp 读取
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 163a957..281d3e0 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -431,7 +431,30 @@
*/
@Override
public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user) {
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
+ List<UserVO> userVOS = baseMapper.selectUserPageSecurity(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ });
+ return page.setRecords(userVOS);
}
/**
@@ -488,5 +511,23 @@
return baseMapper.selectPeo(user);
}
+ /**
+ * 查询用户年龄
+ * @param id
+ * @return
+ */
+ @Override
+ public int getUserAge(long id) {
+ return baseMapper.getUserAge(id);
+ }
+ /**
+ * 查询保安证编号位数
+ * @param pre
+ * @return
+ */
+ @Override
+ public Integer getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
}
--
Gitblit v1.9.3