From bb415e529905ca832604997755d8e192c02cb11e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 23:49:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ICoreMemTreeService.java | 1 - .../core/api/iservice/busi/IPersonnelService.java | 12 ++++-- .../api/iservice/busi/ISysDepartmentService.java | 4 +- .../core/api/iservice/busi/ISysMenuService.java | 2 + .../api/iservice/busi/ISysUserInfoService.java | 2 + .../controller/DemoTestingController.java | 4 +- .../controller/busi/PersonnelController.java | 2 +- .../controller/busi/SysDepartmentController.java | 28 +++++++++++++- .../controller/busi/SysMenuController.java | 21 +++++++++- .../controller/busi/SysUserInfoController.java | 45 +++++++++++++++++++--- .../serviceimpl/busi/PersonnelServiceService.java | 45 +++++++++++++++++++++- .../serviceimpl/busi/SysDepartmentService.java | 10 ++++- .../serviceimpl/busi/SysMenuService.java | 8 ++++ .../serviceimpl/busi/SysUserInfoService.java | 8 ++++ .../serviceimpl/busi/SysUserService.java | 2 + 15 files changed, 174 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java index de00edf..85b53f6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java @@ -113,7 +113,6 @@ public interface ICoreMemTreeService { @ApiOperation(value = "获取部门ID 集合",notes = "使用分装好的树转为TreeMode") List findDepartmentIdListByOrganizeIdAndDepartmentIdAndUserId(Long organizeId, Long departmentId, Long userId); - List findDepartmentIdListByOrganizeIdAndDepartmentId(Long organizeId, Long departmentId); /********************************************* End CommonTreeModel Tree *********************************************/ diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index ca7fcef..f794aef 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -106,6 +106,9 @@ public interface IPersonnelService { List findSysRefUserRole(Long userId,Long roleId,String organizeCode); @ApiOperation(value = "角色权限关系",notes = "根据角色ID 查询权限") + List findSysRefRoleMenuByUserId(Long userId); + + @ApiOperation(value = "角色权限关系",notes = "根据角色ID 查询权限") List findSysRefRoleMenuByRoleIds(List roleIdList); @ApiOperation(value = "角色权限关系",notes = "根据角色ID 查询权限") @@ -119,6 +122,8 @@ public interface IPersonnelService { List findSysRefUserDepartmentByOrganizeIdList(List organizeIdList); + List findSysRefUserDepartmentByOrganizeCode(String organizeCode); + List findSysRefUserDepartmentByDepartmentIdList(List departmentIdList); @ApiOperation(value = "查询账号部门关系") @@ -129,6 +134,8 @@ public interface IPersonnelService { List findSysRefUserInfoDepartmentByOrganizeIdList(List organizeIdList); + List findSysRefUserInfoDepartmentByDepartmentIdList(List departmentIdList); + @ApiOperation(value = "查询用户部门关系") List findSysUserInfoDepartmentByInfoId(Long infoId); @@ -149,10 +156,9 @@ public interface IPersonnelService { List findSysPositionList(); @ApiOperation(value = "查询用户岗位关系") - List findSysRefUserPositionById(Long infoId); + List findSysRefUserPositionByUserInfoId(Long infoId); - @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、操作部门、组织、岗位)") - SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode); + List findSysRefUserPositionByIdList(List idList); @ApiOperation(value = "账号唯一检查") void checkSysUserOnly(SysUser user); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index 184ec50..2fd5d67 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -50,7 +50,9 @@ public interface ISysDepartmentService { * @return */ @ApiOperation(value = "查询部门信息",notes = "查询所有部门信息") - List listSysDepartment(); + List findSysDepartmentList(); + + List findSysDepartmentListByIdList(List idList); /** * 复杂查询 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index 5f735f5..606450b 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -102,6 +102,8 @@ public interface ISysMenuService { @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)") ListPager querySysMenu(SysMenu menu, Pager pager); + ListPager querySysMenu(SysMenu menu,List idList, Pager pager); + } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index acd1ee0..d85dbf4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -109,6 +109,8 @@ public interface ISysUserInfoService { @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager); + ListPager querySysUserInfo(SysUserInfo userInfo,List idList, Pager pager); + /** * 用户唯一校验 * @param userInfo diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index ac477fc..45e6c1b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java @@ -682,7 +682,7 @@ public class DemoTestingController { public void testUserDetailModel() { List roleList = roleService.findSysRoleAll(); List positionList = positionService.findSysPositionAll(); - List departmentList = departmentService.listSysDepartment(); + List departmentList = departmentService.findSysDepartmentList(); for (int l = 0; l < 100; l++) { UserDetailModel model = new UserDetailModel(); @@ -799,7 +799,7 @@ public class DemoTestingController { String PATH = new String(File.separator + "C:\\test\\user"); List roleList = roleService.findSysRoleAll(); List positionList = positionService.findSysPositionAll(); - List departmentList = departmentService.listSysDepartment(); + List departmentList = departmentService.findSysDepartmentList(); List userList = new ArrayList<>(); List userInfoList = new ArrayList<>(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 8e572fb..48dd93b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -296,7 +296,7 @@ public class PersonnelController extends CoreBaseController { ValidatorBean.checkNotNull(user, "账号不存在"); List refUserInfoDepartmentList = personnelService.findSysRefUserInfoDepartmentById(info.getId()); - List refUserPositionList = personnelService.findSysRefUserPositionById(info.getId()); + List refUserPositionList = personnelService.findSysRefUserPositionByUserInfoId(info.getId()); List refUserDepartmentList = personnelService.findSysRefUserDepartmentByUserId(user.getId()); List refUserRoleList = personnelService.findSysRefUserRole(user.getId()); SysFile image = info.getUserImageId() != null ? fileService.getSysFileById(info.getUserImageId()) : null; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 1529577..79a7748 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -23,6 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -129,7 +131,7 @@ public class SysDepartmentController extends CoreBaseController { @ApiOperation(value = "查询所有部门", notes = "查询所有部门") public ResultBean findSysDepartmentAll() { try { - List departmentList = departmentService.listSysDepartment(); + List departmentList = departmentService.findSysDepartmentList(); return ResultBean.success("操作成功").setResultList(departmentList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -138,6 +140,30 @@ public class SysDepartmentController extends CoreBaseController { } } + @GetMapping(value = "/list-user") + @ApiOperation(value = "查询所有部门", notes = "查询所有部门") + public ResultBean findSysDepartmentList() { + try { + List result = null; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + result = departmentService.findSysDepartmentList(); + }else { + List refList = personnelService.findSysRefUserDepartmentByOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + if(refList != null && refList.size() > 0){ + List idList = new ArrayList<>(refList.size()); + refList.forEach(ref -> idList.add(ref.getDepartmentId())); + result = departmentService.findSysDepartmentListByIdList(idList); + } + + } + return ResultBean.success("操作成功").setResultList(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + /** * 根据id查询部门 * @param id 部门id diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index a9f9b95..3c59530 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; @@ -11,7 +12,9 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu; import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppRedis; @@ -29,6 +32,7 @@ import javax.annotation.Resource; import javax.persistence.EntityManager; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -56,6 +60,9 @@ public class SysMenuController extends CoreBaseController { @Resource(name="redisRes") private ImppRedis redisRes; + @Autowired + private IPersonnelService personnelService; + /** * 新增系统功能 * @param menu 系统功能 @@ -174,9 +181,19 @@ public class SysMenuController extends CoreBaseController { @ApiOperation(value = "查询权限", notes = "组合查询权限，外带分页功能") public ResultBean querySysMenu(SysMenu menu, Pager pager) { try { - ListPager listPager = sysMenuService.querySysMenu(menu, pager); + ListPager result = null; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + result = sysMenuService.querySysMenu(menu, pager); + }else { + List refList = personnelService.findSysRefRoleMenuByUserId(getSessionUser().getUser().getId()); + if(refList != null && refList.size() > 0){ + List idList = new ArrayList<>(refList.size()); + refList.forEach(ref -> idList.add(ref.getMenuId())); + result = sysMenuService.querySysMenu(menu,idList,pager); + } + } - return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index aeac706..5bd0177 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -23,8 +23,6 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.compress.archivers.zip.ZipUtil; -import org.aspectj.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -58,7 +56,7 @@ public class SysUserInfoController extends CoreBaseController{ private ISysDepartmentService departmentService; @Autowired - private ISysPositionService sysPositionService; + private ISysPositionService positionService; @Autowired private ISysConfigService sysConfigService; @@ -72,6 +70,12 @@ public class SysUserInfoController extends CoreBaseController{ @Autowired private EntityManager entityManager; + @Autowired + private ICoreMemTreeService memTreeService; + + @Autowired + private IPersonnelService personnelService; + @Resource(name="redisRes") private ImppRedis redisRes; /** @@ -189,8 +193,37 @@ public class SysUserInfoController extends CoreBaseController{ @ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页") public ResultBean querySysUserInfo(SysUserInfo userInfo, Pager pager){ try{ - ListPager listPager = sysUserInfoService.querySysUserInfo(userInfo, pager); - return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + List idList = new ArrayList<>(); + if(userInfo.getOrganizeId() == null || userInfo.getOrganizeId() <= 0) { + if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + userInfo.setOrganizeCode(null); + userInfo.setOrganizeId(null); + } else { + userInfo.setOrganizeId(AuthUtil.getOrganize().getId()); + userInfo.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + } + + List departmentIdList = memTreeService.findDepartmentIdListByOrganizeIdAndDepartmentId(userInfo.getOrganizeId(), userInfo.getDepartmentId()); + if(departmentIdList != null && departmentIdList.size() > 0){ + List refList = personnelService.findSysRefUserInfoDepartmentByDepartmentIdList(departmentIdList); + if(refList != null && refList.size() > 0){ + refList.forEach(ref -> idList.add(ref.getUserId())); + } + } + + if(userInfo.getPositionId() != null && userInfo.getPositionId() > 0){ + List refList = memTreeService.findSysPositionChildIdList(userInfo.getPositionId()); + if(refList != null && refList.size() > 0){ + List refUserPositionList = personnelService.findSysRefUserPositionByIdList(refList); + if(refUserPositionList != null && refUserPositionList.size() > 0){ + refUserPositionList.forEach(ref -> idList.add(ref.getUserId())); + } + } + } + + ListPager result = sysUserInfoService.querySysUserInfo(userInfo,idList, pager); + return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -350,7 +383,7 @@ public class SysUserInfoController extends CoreBaseController{ .build(); } - SysPosition position = sysPositionService.getSysPositionById(userInfo.getPositionId()); + SysPosition position = positionService.getSysPositionById(userInfo.getPositionId()); if(position == null){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 42d4a87..98486cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -314,6 +314,21 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysRefRoleMenuByUserId(Long userId) { + LOGGER.info("平台账号角色 SysRefRoleMenu userId:{}", userId); + if(userId != null){ + List refRoleList = findSysRefUserRole(userId); + if(refRoleList != null && refRoleList.size() > 0){ + List idList = new ArrayList<>(refRoleList.size()); + refRoleList.forEach(ref -> idList.add(ref.getRoleId())); + + return findSysRefRoleMenuByRoleIds( idList); + } + } + return null; + } + + @Override public List findSysRefRoleMenuByRoleIds(List roleIdList) { LOGGER.info("平台账号角色 SysRefRoleMenu roleIdList:{}", roleIdList); if(roleIdList != null){ @@ -366,6 +381,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysRefUserDepartmentByOrganizeCode(String organizeCode) { + LOGGER.info("平台账号部门 SysRefUserDepartment organizeCode:{}", organizeCode); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",packBean); + + return refUserDepartmentRDao.findByHqlWhere(packBean); + } + + @Override public List findSysRefUserDepartmentByDepartmentIdList(List departmentIdList) { LOGGER.info("平台账号部门 SysRefUserDepartment departmentIdList:{}", departmentIdList); @@ -410,6 +435,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysRefUserInfoDepartmentByDepartmentIdList(List departmentIdList) { + LOGGER.info("平台账号部门 SysRefUserInfoDepartment departmentIdList:{}", departmentIdList); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(departmentIdList,"departmentId",packBean); + + return refUserInfoDepartmentRDao.findByHqlWhere(packBean); + } + + @Override @ApiOperation(value = "查询用户部门关系") public List findSysUserInfoDepartmentByInfoId(Long infoId) { LOGGER.info("平台用户部门 SysDepartment infoId:{}", infoId); @@ -506,13 +541,18 @@ public class PersonnelServiceService implements IPersonnelService { } @Override - public List findSysRefUserPositionById(Long infoId) { + public List findSysRefUserPositionByUserInfoId(Long infoId) { LOGGER.info("平台用户岗位 SysRefUserPosition infoId:{}", infoId); return refUserPositionRDao.findByProperty("userId",infoId); } @Override - public SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { + public List findSysRefUserPositionByIdList(List idList) { + if(idList != null && idList.size() > 0){ + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(idList,"positionId",packBean); + return refUserPositionRDao.findByHqlWhere(packBean); + } return null; } @@ -964,6 +1004,7 @@ public class PersonnelServiceService implements IPersonnelService { refUserRole.setUserId(user.getId()); refUserRole.setUserNameRdd(user.getUserName()); refUserRole.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); + refUserRole.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue()); refUserRoles.add(refUserRole); } refUserRoleRDao.saveAll(refUserRoles); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index c0c6122..002d12e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; import cn.estsh.i3plus.pojo.platform.repository.SysDepartmentRepository; @@ -172,12 +173,19 @@ public class SysDepartmentService implements ISysDepartmentService { @Override @ApiOperation(value = "查询部门信息", notes = "查询所有部门信息") - public List listSysDepartment() { + public List findSysDepartmentList() { LOGGER.info("部门信息 DEPARTMENT list"); return departmentRDao.list(); } @Override + public List findSysDepartmentListByIdList(List idList) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(idList,"id",packBean); + return departmentRDao.findByHqlWhere(packBean); + } + + @Override @ApiOperation(value = "查询部门信息", notes = "查询部门信息(分页、组合)") public ListPager querySysDepartment(SysDepartment department, Pager pager) { LOGGER.info("部门 SysDepartment find department :{} page:{}", department, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index 3549c8a..e230b26 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -219,4 +220,11 @@ public class SysMenuService implements ISysMenuService { return new ListPager(sysMenuRDao.findByHqlWherePage(hqlPack + menu.orderBy(), pager), pager); } } + + @Override + public ListPager querySysMenu(SysMenu menu, List idList, Pager pager) { + DdlPackBean packBean = CoreHqlPack.packDdlBeanSysMenu(menu, idList); + pager = PagerHelper.getPager(pager, sysMenuRDao.findByHqlWhereCount(packBean)); + return new ListPager(sysMenuRDao.findByHqlWherePage(packBean, pager), pager); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 26353a1..7d65e7c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -301,6 +302,13 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + public ListPager querySysUserInfo(SysUserInfo userInfo, List idList, Pager pager) { + DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUserInfo(userInfo, idList); + pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(packBean)); + return new ListPager(sysUserInfoRDao.findByHqlWherePage(packBean, pager), pager); + } + + @Override @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") public List findRefUserDepartmentByUserId(Long userId) { return refUserDepartmentRDao.findByProperty("userId",userId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 2496f89..c00aef4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -273,6 +273,8 @@ public class SysUserService implements ISysUserService { refUserRole.setCreateDatetime(TimeTool.getNowTime(true)); refUserRole.setModifyUser(userName); refUserRole.setModifyDatetime(TimeTool.getNowTime(true)); + refUserRole.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue()); + refUserRole.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); refUserRoles.add(refUserRole); }