From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 27 十月 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 2 +-
src/main/java/com/nanometer/smartlab/controller/BaseController.java | 8 ++++++++
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 2 +-
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 11 ++++++++++-
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 3 ++-
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index b7ebec2..d2bc3cd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -143,7 +143,7 @@
}
public void initApproveUserSelectList() {
- this.approveUserSelectList = this.sysUserService.getHasProjectSysUserList(this.getUserDepartment());
+ this.approveUserSelectList = this.sysUserService.getHasProjectSysUserList(this.getUserDepartment(),this.getUserProject());
if (!CollectionUtils.isEmpty(this.approveUserSelectList)){
if(this.selectedList == null){
this.sysProjectList = sysProjectService.getSysProjectList(this.approveUserSelectList.get(0).getId());
diff --git a/src/main/java/com/nanometer/smartlab/controller/BaseController.java b/src/main/java/com/nanometer/smartlab/controller/BaseController.java
index 2c821ad..f844bc3 100644
--- a/src/main/java/com/nanometer/smartlab/controller/BaseController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/BaseController.java
@@ -55,4 +55,12 @@
}
return null;
}
+
+ public String getUserProject() {
+ SysUser user = this.getUser();
+ if (user != null) {
+ return user.getProject();
+ }
+ return null;
+ }
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index f5da893..f77d627 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -146,7 +146,16 @@
select DISTINCT su.*, br.name as roleName from sys_user as su
left join base_role as br on su.role_id = br.id inner join sys_project as sp on su.id=sp.sys_user_id
where su.valid_flag = 1
- <include refid="queryWhereSql"/>
+ <if test="department != null and department != ''">
+ and su.department = #{department}
+ </if>
+ <if test="approverFlag != null">
+ and su.approver_flag = #{approverFlag}
+ </if>
+ <if test="project != null and project != ''">
+ and (su.project like concat('%',#{project},'%')
+ or su.project is null or su.project = '')
+ </if>
order by su.arp ASC
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 325fd7e..2a649fe 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -24,7 +24,7 @@
SysUser getSysUserByIdCard(String idCard);
boolean isSysUserExist(String arp, String account, String idCard, String editId);
List<SysUser> getApproverUserList(String department);
- List<SysUser> getHasProjectSysUserList(String department);
+ List<SysUser> getHasProjectSysUserList(String department,String project);
List<SysUser> getApplyUserList();
List<SysUser> getSeeUserList(String department);
SysUser insertSysUser(SysUser sysUser);
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index aa11981..9ddbbac 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -192,10 +192,11 @@
}
@Override
- public List<SysUser> getHasProjectSysUserList(String department) {
+ public List<SysUser> getHasProjectSysUserList(String department, String project) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("department", department);
+ params.put("project", project);
params.put("approverFlag", ApproverFlag.YES);
return this.sysUserDao.getHasProjectSysUserList(params);
} catch (DataAccessException e) {
--
Gitblit v1.9.2