gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.3.4】添加组织机构选择器

pull/52/head
ye_star 2023-03-25 12:53:03 +08:00
parent 8df6f1361e
commit 3aabf715b5
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
View File

@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.controller;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog;
import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum;
import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
@ -37,6 +38,7 @@ import cn.stylefeng.roses.kernel.system.api.enums.OrgTypeEnum;
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest;
import cn.stylefeng.roses.kernel.system.api.pojo.organization.OrganizationTreeNode;
import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest;
import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization;
import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService;
import cn.stylefeng.roses.kernel.system.modular.organization.wrapper.OrgExpandWrapper;
@ -254,4 +256,16 @@ public class HrOrganizationController {
return new SuccessResponseData<>(orgDetailList);
}
/**
* 组织下拉列表，可以根据组织名称搜索
*
* @param request 请求参数
* @return 返回组织信息
* @author yxx
* @date 2023/03/05 09:49
*/
@GetResource(name = "组织机构_选择器", path = "/hrOrganization/selector",requiredPermission = false)
public ResponseData<List<SimpleDict>> selector(HrOrganizationRequest request) {
return new SuccessResponseData<>(hrOrganizationService.selector(request));
}
}

7
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java
View File

@ -25,6 +25,7 @@
package cn.stylefeng.roses.kernel.system.modular.organization.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi;
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest;
@ -140,4 +141,10 @@ public interface HrOrganizationService extends IService<HrOrganization>, Organiz
*/
Set<Long> findAllLevelParentIdsByOrganizations(Set<Long> organizationIds);
/**
* 组织机构选择器
* @param request 请求参数
* @return 选择列表
*/
List<SimpleDict> selector(HrOrganizationRequest request);
}

32
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
View File

@ -44,6 +44,7 @@ import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
import cn.stylefeng.roses.kernel.system.api.RoleDataScopeServiceApi;
@ -313,6 +314,37 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
return allLevelParentIds;
}
@Override
public List<SimpleDict> selector(HrOrganizationRequest request) {
LambdaQueryWrapper<HrOrganization> queryWrapper = new LambdaQueryWrapper<>();
String orgName = request.getOrgName();
String orgCode = request.getOrgCode();
Long orgId = request.getOrgId();
// 查询未删除状态的
queryWrapper.eq(HrOrganization::getDelFlag, YesOrNotEnum.N.getCode());
// 拼接组织机构名称条件
queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName);
// 拼接组织机构编码条件
queryWrapper.like(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode);
// 拼接机构id查询条件
queryWrapper.eq(ObjectUtil.isNotEmpty(orgId), HrOrganization::getOrgId, orgId);
queryWrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgCode, HrOrganization::getOrgName);
List<HrOrganization> list = this.list(queryWrapper);
ArrayList<SimpleDict> results = new ArrayList<>();
for (HrOrganization org : list) {
SimpleDict simpleDict = new SimpleDict();
simpleDict.setId(org.getOrgId());
simpleDict.setName(org.getOrgName());
simpleDict.setCode(org.getOrgCode());
results.add(simpleDict);
}
return results;
}
@Override
public List<HrOrganizationDTO> orgList() {