From 44486bd993eecea4324734431640227a986b2425 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 11 Aug 2022 17:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86-=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=90=8D=E7=A7=B0-=E5=85=A8=E5=B1=80=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2-=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartController.java | 10 ++++--- .../system/controller/SysUserController.java | 17 ++++++++--- .../system/service/ISysDepartService.java | 6 ++-- .../service/impl/SysDepartServiceImpl.java | 28 +++++++++++-------- .../system/util/FindsDepartsChildrenUtil.java | 19 +++++++------ 5 files changed, 50 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 00968a75d..443b87522 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -100,7 +100,7 @@ public class SysDepartController { @ApiOperation(value = "部门管理-查询树状结构") @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) - public Result> queryTreeList() { + public Result> queryTreeList(@RequestParam(name = "cut", required = false) String cut) { Result> result = new Result<>(); try { // 从内存中读取 @@ -108,7 +108,7 @@ public class SysDepartController { // if (CollectionUtils.isEmpty(list)) { // list = sysDepartService.queryTreeList(); // } - List list = sysDepartService.queryTreeList(); + List list = sysDepartService.queryTreeList(cut); result.setResult(list); result.setSuccess(true); } catch (Exception e) { @@ -272,7 +272,9 @@ public class SysDepartController { */ @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/searchBy", method = RequestMethod.GET) - public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { + public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, + @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch, + @RequestParam(name = "cut", required = false) String cut) { Result> result = new Result>(); //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -280,7 +282,7 @@ public class SysDepartController { if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ departIds = user.getDepartIds(); } - List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); + List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds,cut); if (treeList == null || treeList.size() == 0) { result.setSuccess(false); result.setMessage("未查询匹配数据！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 25213835a..9d8a7a787 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; @@ -1486,7 +1487,7 @@ public class SysUserController { Result> result = new Result<>(); //获取当前组织下数据 - List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId); + List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId, sysPushVO.getCut()); if (StringUtils.isNotEmpty(departId)) { List departIds = new ArrayList<>(); departIds.add(departId); @@ -1537,7 +1538,7 @@ public class SysUserController { @AutoLog(value = "文档库推送部门和人员的模糊搜索") @ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索") @GetMapping(value = "/getUserAndDepart") - public List getUserAndDepart(String name){ + public List getUserAndDepart(String name, String cut){ if("%".equals(name)){ name = "/%"; } @@ -1546,7 +1547,11 @@ public class SysUserController { List sysUserList = sysUserService.list(lambdaQueryWrapper); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(SysDepart::getDepartName,name); + if (CutEnum.EN.getValue().equals(cut)) { + wrapper.like(SysDepart::getDepartNameEn, name); + } else { + wrapper.like(SysDepart::getDepartName, name); + } List sysDepartList = sysDepartService.list(wrapper); List list = new LinkedList<>(); @@ -1554,7 +1559,11 @@ public class SysUserController { for (SysDepart sysDepart : sysDepartList) { SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); sysUserDepartVO.setKey(sysDepart.getId()); - sysUserDepartVO.setTitle(sysDepart.getDepartName()); + if (CutEnum.EN.getValue().equals(cut)) { + sysUserDepartVO.setTitle(sysDepart.getDepartNameEn()); + } else { + sysUserDepartVO.setTitle(sysDepart.getDepartName()); + } sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue()); list.add(sysUserDepartVO); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index 667744bd1..4893c132c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java @@ -27,9 +27,9 @@ public interface ISysDepartService extends IService{ * 查询所有部门信息,并分节点进行显示 * @return */ - List queryTreeList(); + List queryTreeList(String cut); - List queryTreeListByDepartId(String departId); + List queryTreeListByDepartId(String departId, String cut); /** * 查询所有部门DepartId信息,并分节点进行显示 @@ -62,7 +62,7 @@ public interface ISysDepartService extends IService{ * @param keyWord * @return */ - List searhBy(String keyWord,String myDeptSearch,String departIds); + List searhBy(String keyWord,String myDeptSearch,String departIds,String cut); /** * 根据部门id删除并删除其可能存在的子级部门 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index b3a914e79..02027b250 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.YouBianCodeUtil; @@ -70,7 +71,7 @@ public class SysDepartServiceImpl extends ServiceImpl listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts, null); return listResult; } @@ -79,20 +80,20 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeList() { + public List queryTreeList(String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.last("order by depart_order is null, depart_order asc"); List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, cut); return listResult; } // @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE) @Override - public List queryTreeListByDepartId(String departId) { + public List queryTreeListByDepartId(String departId, String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); if (StringUtils.isBlank(departId)) { query.isNull(SysDepart::getParentId); @@ -108,7 +109,7 @@ public class SysDepartServiceImpl extends ServiceImpl */ @Override - public List searhBy(String keyWord,String myDeptSearch,String departIds) { + public List searhBy(String keyWord,String myDeptSearch,String departIds,String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); List newList = new ArrayList<>(); //myDeptSearch不为空时为我的部门搜索，只搜索所负责部门 @@ -317,7 +318,12 @@ public class SysDepartServiceImpl extends ServiceImpl departList = this.list(query); @@ -325,7 +331,7 @@ public class SysDepartServiceImpl extends ServiceImpl list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null); List treelist =new ArrayList<>(); if(StringUtils.isNotBlank(keyWord)){ this.getTreeByKeyWord(keyWord,listResult,treelist); @@ -519,7 +525,7 @@ public class SysDepartServiceImpl extends ServiceImpl sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult); + List sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult, null); realResult.addAll(sysDepartTreeModels); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index ce47aa0ab..18be6e865 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java @@ -1,12 +1,10 @@ package com.jero.modules.system.util; -import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.SysDepartTreeModel; -import com.jero.common.util.RedisUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.model.DepartIdModel; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; @@ -32,7 +30,7 @@ public class FindsDepartsChildrenUtil { * queryTreeList的子方法 ====1===== * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合 */ - public static List wrapTreeDataToTreeList(List recordList) { + public static List wrapTreeDataToTreeList(List recordList, String cut) { // 在该方法每请求一次,都要对全局list集合进行一次清理 //idList.clear(); List idList = new ArrayList(); @@ -41,7 +39,7 @@ public class FindsDepartsChildrenUtil { SysDepart depart = recordList.get(i); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); // 将sysDepart转换为sysDepartTreeModel - convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); + convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut); records.add(sysDepartTreeModel); } List tree = findChildren(records, idList); @@ -63,7 +61,7 @@ public class FindsDepartsChildrenUtil { SysDepart depart = recordList.get(i); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); // 将sysDepart转换为sysDepartTreeModel - convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); + convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, null); records.add(sysDepartTreeModel); } findChildren(records, idList); @@ -144,10 +142,14 @@ public class FindsDepartsChildrenUtil { * @param sysDepartTreeModel 转换的结果对象 * @return */ - public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel){ + public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel, String cut){ sysDepartTreeModel.setKey( sysDepart.getId()); sysDepartTreeModel.setValue( sysDepart.getId()); - sysDepartTreeModel.setTitle(sysDepart.getDepartName()); + if (CutEnum.EN.getValue().equals(cut)) { // 部门名称中英文处理 + sysDepartTreeModel.setTitle(sysDepart.getDepartNameEn()); + } else { + sysDepartTreeModel.setTitle(sysDepart.getDepartName()); + } sysDepartTreeModel.setId(sysDepart.getId()); sysDepartTreeModel.setParentId(sysDepart.getParentId()); sysDepartTreeModel.setDepartName(sysDepart.getDepartName()); @@ -169,4 +171,5 @@ public class FindsDepartsChildrenUtil { sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy()); sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime()); } + }