WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门管理-部门名称-全局中英文切换-翻译修改

Browse Source
This commit is contained in:
liyawei
2022-08-11 17:10:43 +08:00
parent 799bbd1591
commit 44486bd993
5 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+6 -4
View File
@@ -100,7 +100,7 @@ public class SysDepartController {
@ApiOperation(value = "部门管理-查询树状结构") @ApiOperation(value = "部门管理-查询树状结构")
@RequiresPermissions("sys:depart:list") @RequiresPermissions("sys:depart:list")
@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
public Result<List<SysDepartTreeModel>> queryTreeList() { public Result<List<SysDepartTreeModel>> queryTreeList(@RequestParam(name = "cut", required = false) String cut) {
Result<List<SysDepartTreeModel>> result = new Result<>(); Result<List<SysDepartTreeModel>> result = new Result<>();
try { try {
// 从内存中读取 // 从内存中读取
@@ -108,7 +108,7 @@ public class SysDepartController {
// if (CollectionUtils.isEmpty(list)) { // if (CollectionUtils.isEmpty(list)) {
// list = sysDepartService.queryTreeList(); // list = sysDepartService.queryTreeList();
// } // }
List<SysDepartTreeModel> list = sysDepartService.queryTreeList(); List<SysDepartTreeModel> list = sysDepartService.queryTreeList(cut);
result.setResult(list); result.setResult(list);
result.setSuccess(true); result.setSuccess(true);
} catch (Exception e) { } catch (Exception e) {
@@ -272,7 +272,9 @@ public class SysDepartController {
*/ */
@RequiresPermissions("sys:depart:list") @RequiresPermissions("sys:depart:list")
@RequestMapping(value = "/searchBy", method = RequestMethod.GET) @RequestMapping(value = "/searchBy", method = RequestMethod.GET)
public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,
@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch,
@RequestParam(name = "cut", required = false) String cut) {
Result<List<SysDepartTreeModel>> result = new Result<List<SysDepartTreeModel>>(); Result<List<SysDepartTreeModel>> result = new Result<List<SysDepartTreeModel>>();
//部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); 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 )){ if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
departIds = user.getDepartIds(); departIds = user.getDepartIds();
} }
List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds,cut);
if (treeList == null || treeList.size() == 0) { if (treeList == null || treeList.size() == 0) {
result.setSuccess(false); result.setSuccess(false);
result.setMessage("未查询匹配数据！"); result.setMessage("未查询匹配数据！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+13 -4
View File
@@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant; 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.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.util.JwtUtil; import com.jero.common.system.util.JwtUtil;
@@ -1486,7 +1487,7 @@ public class SysUserController {
Result<List<SysDepartUserTreeModel>> result = new Result<>(); Result<List<SysDepartUserTreeModel>> result = new Result<>();
//获取当前组织下数据 //获取当前组织下数据
List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId); List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId, sysPushVO.getCut());
if (StringUtils.isNotEmpty(departId)) { if (StringUtils.isNotEmpty(departId)) {
List<String> departIds = new ArrayList<>(); List<String> departIds = new ArrayList<>();
departIds.add(departId); departIds.add(departId);
@@ -1537,7 +1538,7 @@ public class SysUserController {
@AutoLog(value = "文档库推送部门和人员的模糊搜索") @AutoLog(value = "文档库推送部门和人员的模糊搜索")
@ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索") @ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索")
@GetMapping(value = "/getUserAndDepart") @GetMapping(value = "/getUserAndDepart")
public List<SysUserDepartVO> getUserAndDepart(String name){ public List<SysUserDepartVO> getUserAndDepart(String name, String cut){
if("%".equals(name)){ if("%".equals(name)){
name = "/%"; name = "/%";
} }
@@ -1546,7 +1547,11 @@ public class SysUserController {
List<SysUser> sysUserList = sysUserService.list(lambdaQueryWrapper); List<SysUser> sysUserList = sysUserService.list(lambdaQueryWrapper);
LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDepart> 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<SysDepart> sysDepartList = sysDepartService.list(wrapper); List<SysDepart> sysDepartList = sysDepartService.list(wrapper);
List<SysUserDepartVO> list = new LinkedList<>(); List<SysUserDepartVO> list = new LinkedList<>();
@@ -1554,7 +1559,11 @@ public class SysUserController {
for (SysDepart sysDepart : sysDepartList) { for (SysDepart sysDepart : sysDepartList) {
SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
sysUserDepartVO.setKey(sysDepart.getId()); 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()); sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
list.add(sysUserDepartVO); list.add(sysUserDepartVO);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java
+3 -3
View File
@@ -27,9 +27,9 @@ public interface ISysDepartService extends IService<SysDepart>{
* 查询所有部门信息,并分节点进行显示 * 查询所有部门信息,并分节点进行显示
* @return * @return
*/ */
List<SysDepartTreeModel> queryTreeList(); List<SysDepartTreeModel> queryTreeList(String cut);
List<SysDepartTreeModel> queryTreeListByDepartId(String departId); List<SysDepartTreeModel> queryTreeListByDepartId(String departId, String cut);
/** /**
* 查询所有部门DepartId信息,并分节点进行显示 * 查询所有部门DepartId信息,并分节点进行显示
@@ -62,7 +62,7 @@ public interface ISysDepartService extends IService<SysDepart>{
* @param keyWord * @param keyWord
* @return * @return
*/ */
List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds); List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds,String cut);
/** /**
* 根据部门id删除并删除其可能存在的子级部门 * 根据部门id删除并删除其可能存在的子级部门
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java
+17 -11
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.FillRuleConstant; import com.jero.common.constant.FillRuleConstant;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.util.FillRuleUtil; import com.jero.common.util.FillRuleUtil;
import com.jero.common.util.YouBianCodeUtil; import com.jero.common.util.YouBianCodeUtil;
@@ -70,7 +71,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
} }
} }
// 调用wrapTreeDataToTreeList方法生成树状数据 // 调用wrapTreeDataToTreeList方法生成树状数据
List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts, null);
return listResult; return listResult;
} }
@@ -79,20 +80,20 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
*/ */
@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE) @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
@Override @Override
public List<SysDepartTreeModel> queryTreeList() { public List<SysDepartTreeModel> queryTreeList(String cut) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
query.last("order by depart_order is null, depart_order asc"); query.last("order by depart_order is null, depart_order asc");
List<SysDepart> list = this.list(query); List<SysDepart> list = this.list(query);
// 调用wrapTreeDataToTreeList方法生成树状数据 // 调用wrapTreeDataToTreeList方法生成树状数据
List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, cut);
return listResult; return listResult;
} }
// @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE) // @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
@Override @Override
public List<SysDepartTreeModel> queryTreeListByDepartId(String departId) { public List<SysDepartTreeModel> queryTreeListByDepartId(String departId, String cut) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
if (StringUtils.isBlank(departId)) { if (StringUtils.isBlank(departId)) {
query.isNull(SysDepart::getParentId); query.isNull(SysDepart::getParentId);
@@ -108,7 +109,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
SysDepart depart = list.get(i); SysDepart depart = list.get(i);
SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
// 将sysDepart转换为sysDepartTreeModel // 将sysDepart转换为sysDepartTreeModel
convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
listResult.add(sysDepartTreeModel); listResult.add(sysDepartTreeModel);
} }
return listResult; return listResult;
@@ -301,7 +302,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
* </p> * </p>
*/ */
@Override @Override
public List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds) { public List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds,String cut) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
List<SysDepartTreeModel> newList = new ArrayList<>(); List<SysDepartTreeModel> newList = new ArrayList<>();
//myDeptSearch不为空时为我的部门搜索，只搜索所负责部门 //myDeptSearch不为空时为我的部门搜索，只搜索所负责部门
@@ -317,7 +318,12 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
} }
query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
} }
query.like(SysDepart::getDepartName, keyWord);
if (CutEnum.EN.getValue().equals(cut)) {
query.like(SysDepart::getDepartNameEn, keyWord);
} else {
query.like(SysDepart::getDepartName, keyWord);
}
//update-begin--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索回显优化-------------------- //update-begin--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索回显优化--------------------
SysDepartTreeModel model = new SysDepartTreeModel(); SysDepartTreeModel model = new SysDepartTreeModel();
List<SysDepart> departList = this.list(query); List<SysDepart> departList = this.list(query);
@@ -325,7 +331,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
for(SysDepart depart : departList) { for(SysDepart depart : departList) {
SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
// 将sysDepart转换为sysDepartTreeModel // 将sysDepart转换为sysDepartTreeModel
convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
model = sysDepartTreeModel; model = sysDepartTreeModel;
model.setChildren(null); model.setChildren(null);
//update-end--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索功回显优化---------------------- //update-end--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------
@@ -473,7 +479,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
query.orderByAsc(SysDepart::getDepartOrder); query.orderByAsc(SysDepart::getDepartOrder);
List<SysDepart> list = this.list(query); List<SysDepart> list = this.list(query);
// 调用wrapTreeDataToTreeList方法生成树状数据 // 调用wrapTreeDataToTreeList方法生成树状数据
List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null);
List<SysDepartTreeModel> treelist =new ArrayList<>(); List<SysDepartTreeModel> treelist =new ArrayList<>();
if(StringUtils.isNotBlank(keyWord)){ if(StringUtils.isNotBlank(keyWord)){
this.getTreeByKeyWord(keyWord,listResult,treelist); this.getTreeByKeyWord(keyWord,listResult,treelist);
@@ -519,7 +525,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
} }
Collections.reverse(list); Collections.reverse(list);
// 调用wrapTreeDataToTreeList方法生成树状数据 // 调用wrapTreeDataToTreeList方法生成树状数据
return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null);
} }
/** /**
@@ -547,7 +553,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
SysDepart sysDepartTemp = this.getById(id); SysDepart sysDepartTemp = this.getById(id);
listResult.add(sysDepartTemp); listResult.add(sysDepartTemp);
}); });
List<SysDepartTreeModel> sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult); List<SysDepartTreeModel> sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult, null);
realResult.addAll(sysDepartTreeModels); realResult.addAll(sysDepartTreeModels);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java
+11 -8
View File
@@ -1,12 +1,10 @@
package com.jero.modules.system.util; 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.system.vo.SysDepartTreeModel;
import com.jero.common.util.RedisUtil;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.DepartIdModel;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -32,7 +30,7 @@ public class FindsDepartsChildrenUtil {
* queryTreeList的子方法 ====1===== * queryTreeList的子方法 ====1=====
* 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合 * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合
*/ */
public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList) { public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList, String cut) {
// 在该方法每请求一次,都要对全局list集合进行一次清理 // 在该方法每请求一次,都要对全局list集合进行一次清理
//idList.clear(); //idList.clear();
List<DepartIdModel> idList = new ArrayList<DepartIdModel>(); List<DepartIdModel> idList = new ArrayList<DepartIdModel>();
@@ -41,7 +39,7 @@ public class FindsDepartsChildrenUtil {
SysDepart depart = recordList.get(i); SysDepart depart = recordList.get(i);
SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
// 将sysDepart转换为sysDepartTreeModel // 将sysDepart转换为sysDepartTreeModel
convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
records.add(sysDepartTreeModel); records.add(sysDepartTreeModel);
} }
List<SysDepartTreeModel> tree = findChildren(records, idList); List<SysDepartTreeModel> tree = findChildren(records, idList);
@@ -63,7 +61,7 @@ public class FindsDepartsChildrenUtil {
SysDepart depart = recordList.get(i); SysDepart depart = recordList.get(i);
SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
// 将sysDepart转换为sysDepartTreeModel // 将sysDepart转换为sysDepartTreeModel
convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, null);
records.add(sysDepartTreeModel); records.add(sysDepartTreeModel);
} }
findChildren(records, idList); findChildren(records, idList);
@@ -144,10 +142,14 @@ public class FindsDepartsChildrenUtil {
* @param sysDepartTreeModel 转换的结果对象 * @param sysDepartTreeModel 转换的结果对象
* @return * @return
*/ */
public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel){ public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel, String cut){
sysDepartTreeModel.setKey( sysDepart.getId()); sysDepartTreeModel.setKey( sysDepart.getId());
sysDepartTreeModel.setValue( 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.setId(sysDepart.getId());
sysDepartTreeModel.setParentId(sysDepart.getParentId()); sysDepartTreeModel.setParentId(sysDepart.getParentId());
sysDepartTreeModel.setDepartName(sysDepart.getDepartName()); sysDepartTreeModel.setDepartName(sysDepart.getDepartName());
@@ -169,4 +171,5 @@ public class FindsDepartsChildrenUtil {
sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy()); sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy());
sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime()); sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime());
} }
} }