diff --git a/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/utils/poi/ExcelUtil.java b/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/utils/poi/ExcelUtil.java index 339886d..523f666 100644 --- a/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/utils/poi/ExcelUtil.java +++ b/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/utils/poi/ExcelUtil.java @@ -259,7 +259,7 @@ public class ExcelUtil if (Collection.class.isAssignableFrom(field.getType())) { Cell cell = subRow.createCell(column); - cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn()); + cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn()); cell.setCellStyle(cellStyle); int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0; if (subFieldSize > 1) @@ -272,7 +272,7 @@ public class ExcelUtil else { Cell cell = subRow.createCell(column++); - cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn()); + cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn()); cell.setCellStyle(cellStyle); } } @@ -844,7 +844,7 @@ public class ExcelUtil // 创建列 Cell cell = row.createCell(column); // 写入列信息 - cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn()); + cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn()); setDataValidation(attr, row, column); cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); if (isSubList()) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java index 2d42cd4..040f829 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java @@ -71,9 +71,9 @@ public class SystemLogController extends BaseController List list = systemLogService.queryList(form); for(SystemLog l : list){ l.setCzsj(DateUtils.parseDateToStr(l.getCreateTime()==null?"": DateUtils.YYYY_MM_DD_HH_MM_SS,l.getCreateTime())); - l.setCzlx(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?l.getJcmc():l.getJcmcEn()); + l.setCzlx("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?l.getJcmc():l.getJcmcEn()); String czxq = ""; - if(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")){ + if("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))){ try{ JSONArray jsonArray = JSONArray.parseArray(l.getJcnr()); for(int i=0;i implements queryWrapper.like("s.sn",form.getSn()); } if(StringUtils.isNoneBlank(form.getLeaderName())){ - queryWrapper.like("u.nick_name",form.getLeaderName()); + queryWrapper.like("s.`leader_name`",form.getLeaderName()); } if (StringUtils.isNoneBlank(form.getStartDate())) { queryWrapper.ge("s.create_time", form.getStartDate()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java index c5b5910..69f9a18 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java @@ -61,7 +61,8 @@ public class SysDictDataController extends BaseController @GetMapping("/list") public TableDataInfo list(SysDictData dictData) { - if(StringUtils.equals(dictData.getDictType(), "business_ccwz")) { + String ccwz = "business_ccwz"; + if(StringUtils.equals(dictData.getDictType(),ccwz)) { YqSearchForm form = new YqSearchForm(); List superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId()); List deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java index 0fd5f4f..0da649d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java @@ -70,9 +70,9 @@ public class SysLogininforController extends BaseController for(SysLogininfor l:list){ SystemLog systemLog = new SystemLog(); systemLog.setQmrMc(l.getNickName()); - systemLog.setCzlx(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"登录":"Login"); + systemLog.setCzlx("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"登录":"Login"); systemLog.setCzsj(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,l.getAccessTime())); - systemLog.setCzxq(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?l.getMsg():l.getMsgEn()); + systemLog.setCzxq("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?l.getMsg():l.getMsgEn()); logList.add(systemLog); } ExcelUtil util = new ExcelUtil(SystemLog.class); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java index b7bb82e..990c2f6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java @@ -81,7 +81,7 @@ public class SysRoleController extends BaseController { List list = roleService.selectRoleList(role); for(SysRole l : list){ - l.setStatusText("0".endsWith(l.getStatus())?(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"启用":"Enabled"):(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"禁用":"Disabled")); + l.setStatusText("0".endsWith(l.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled")); } ExcelUtil util = new ExcelUtil(SysRole.class); util.exportExcel(response, list, "角色数据"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java index a0ce4a9..34e3509 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java @@ -118,7 +118,7 @@ public class SysUserController extends BaseController exportDto.setDeptName(u.getDept()==null?"":u.getDept().getDeptName()); exportDto.setRoleName(getRoleName(u.getRoles())); - exportDto.setStatus("0".endsWith(u.getStatus())?(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"启用":"Enabled"):(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"禁用":"Disabled")); + exportDto.setStatus("0".endsWith(u.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled")); userList.add(exportDto); } ExcelUtil util = new ExcelUtil(UserExportDto.class); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java index 0851c13..7ca3cb4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java @@ -635,7 +635,8 @@ public class SysMenuServiceImpl implements ISysMenuService if(menus!=null && menus.size()>0){ SysMenu firstMenu = menus.get(0); urlList.add(firstMenu.getPath()); - if(!firstMenu.getMenuType().equals("C")){ + String menu = "C"; + if(!menu.equals(firstMenu.getMenuType())){ urlList = getChildUrl(urlList,firstMenu.getChildren()); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java index ba75016..35adece 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java @@ -647,9 +647,7 @@ public class SysUserServiceImpl implements ISysUserService private List getModifyLogList(SysUser info, SignForm sign){ SysUser old = selectUserById(info.getUserId()); List oldRoleIdList = roleMapper.selectRoleListByUserId(info.getUserId()); - List list = new ArrayList<>(); - List fieldChanges = ObjectCompareUtil.compareObjects(old, info); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { SystemLog log = getLogInfo(old); @@ -672,7 +670,6 @@ public class SysUserServiceImpl implements ISysUserService log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Department\"},{\"name\":\"Old Value\",\"value\":\""+oldDept.getDeptName()+"\"},{\"name\":\"New Value\",\"value\":\""+newDept.getDeptName()+"\"}]"); list.add(log); } - //判断菜单修改 Boolean updateRole = false; if(info.getRoleIds().length!=oldRoleIdList.size()){ @@ -687,9 +684,7 @@ public class SysUserServiceImpl implements ISysUserService } if(updateRole){ checkPassword(SecurityUtils.getLoginUser().getSysUser(),sign.getQmrmm(),false); - List allRoleList = roleMapper.selectRoleList(new SysRole()); - List oldRoleList = new ArrayList<>(); List newRoleList = new ArrayList<>(); if(info.getRoleIds()!=null && info.getRoleIds().length>0){ @@ -702,10 +697,8 @@ public class SysUserServiceImpl implements ISysUserService oldRoleList.add(allRoleList.stream().filter(o->o.getRoleId().equals(oldRoleId)).collect(Collectors.toList()).get(0)); } } - List oldRoleNameList = oldRoleList.stream().map(o->o.getRoleName()).collect(Collectors.toList()); List bghList = oldRoleList.stream().map(o->o.getRoleName()).collect(Collectors.toList()); - List addNameList = new ArrayList<>(); List deleteNameList = new ArrayList<>(); for(SysRole newRole : newRoleList){ @@ -714,7 +707,6 @@ public class SysUserServiceImpl implements ISysUserService bghList.add(newRole.getRoleName()); } } - List newMenuIdList = Arrays.asList(info.getRoleIds()); for(SysRole oldRole : oldRoleList){ if(!newMenuIdList.contains(oldRole.getRoleId())){ @@ -722,7 +714,6 @@ public class SysUserServiceImpl implements ISysUserService bghList.remove(oldRole.getRoleName()); } } - if(addNameList.size()>0 || deleteNameList.size()>0){ SystemLog log = getLogInfo(old); log.setJcnr((addNameList.size()>0?("新增角色："+String.join(",",addNameList)):"")+(deleteNameList.size()>0?("；删除角色："+String.join(",",deleteNameList)):"")+(StringUtils.isBlank(sign.getRemark())?"":"；备注："+sign.getRemark())); @@ -731,7 +722,6 @@ public class SysUserServiceImpl implements ISysUserService } roleChangeService.saveInfo(info.getUserId(),String.join(",",oldRoleNameList),String.join(",",bghList),sign.getRemark()); } - return list; }