From c50d07b9491983971fc81e322945841c604a4585 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 18 Mar 2019 22:52:12 +0800 Subject: [PATCH] =?UTF-8?q?EmpUserService=E6=B7=BB=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E6=9C=80=E5=9F=BA=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AFAPI=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/sys/dao/EmpUserDao.java | 22 ++++++ .../jeesite/modules/sys/entity/EmpUser.java | 12 ++- .../modules/sys/service/EmpUserService.java | 22 ++++++ .../support/EmpUserServiceSupport.java | 28 +++++++ .../mappings/modules/sys/EmpUserDao.xml | 77 +++++++++++++++++++ .../views/modules/sys/user/empUserIndex.html | 1 + 6 files changed, 161 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java index b320d9f3..d26eac69 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java @@ -3,6 +3,8 @@ */ package com.jeesite.modules.sys.dao; +import java.util.List; + import com.jeesite.common.dao.CrudDao; import com.jeesite.common.datasource.DataSourceHolder; import com.jeesite.common.mybatis.annotation.MyBatisDao; @@ -16,4 +18,24 @@ import com.jeesite.modules.sys.entity.EmpUser; @MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) public interface EmpUserDao extends CrudDao { + /** + * 查询全部用户，仅返回基本信息 + */ + public List findUserList(EmpUser empUser); + + /** + * 根据部门编码查询用户，仅返回基本信息 + */ + public List findUserListByOfficeCodes(EmpUser empUser); + + /** + * 根据角色编码查询用户，仅返回基本信息 + */ + public List findUserListByRoleCodes(EmpUser empUser); + + /** + * 根据岗位编码查询用户，仅返回基本信息 + */ + public List findUserListByPostCodes(EmpUser empUser); + } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index 22fbf587..6e576c52 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -68,7 +68,9 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType; public class EmpUser extends User { private static final long serialVersionUID = 1L; - + + private String[] codes; // 查询用 + public EmpUser() { this(null); } @@ -103,5 +105,13 @@ public class EmpUser extends User { public void setEmployee(Employee employee){ super.setRefObj(employee); } + + public String[] getCodes() { + return codes; + } + + public void setCodes(String[] codes) { + this.codes = codes; + } } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java index a89e9121..4114d7ed 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java @@ -3,6 +3,8 @@ */ package com.jeesite.modules.sys.service; +import java.util.List; + import org.springframework.web.multipart.MultipartFile; import com.jeesite.common.entity.Page; @@ -35,6 +37,26 @@ public interface EmpUserService extends CrudServiceApi { */ @Override public Page findPage(EmpUser empUser); + + /** + * 查询全部用户，仅返回基本信息 + */ + public List findUserList(EmpUser empUser); + + /** + * 根据部门编码查询用户，仅返回基本信息 + */ + public List findUserListByOfficeCodes(EmpUser empUser); + + /** + * 根据角色编码查询用户，仅返回基本信息 + */ + public List findUserListByRoleCodes(EmpUser empUser); + + /** + * 根据岗位编码查询用户，仅返回基本信息 + */ + public List findUserListByPostCodes(EmpUser empUser); /** * 保存用户员工 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index 8f0a0ef5..0e0198fc 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -74,6 +74,34 @@ public class EmpUserServiceSupport extends CrudService return super.findPage(empUser); } + /** + * 查询全部用户，仅返回基本信息 + */ + public List findUserList(EmpUser empUser){ + return dao.findUserList(empUser); + } + + /** + * 根据部门编码查询用户，仅返回基本信息 + */ + public List findUserListByOfficeCodes(EmpUser empUser){ + return dao.findUserListByOfficeCodes(empUser); + } + + /** + * 根据角色编码查询用户，仅返回基本信息 + */ + public List findUserListByRoleCodes(EmpUser empUser){ + return dao.findUserListByRoleCodes(empUser); + } + + /** + * 根据岗位编码查询用户，仅返回基本信息 + */ + public List findUserListByPostCodes(EmpUser empUser){ + return dao.findUserListByPostCodes(empUser); + } + /** * 保存用户员工 */ diff --git a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml index f9d499b7..78990e14 100644 --- a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml +++ b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml @@ -24,4 +24,81 @@ ORDER BY ${sqlMap.order.toSql()} + + a.user_code as "userCode", + a.user_name as "userName" + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index 3c469ba6..dc75620f 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -29,6 +29,7 @@