diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 73c7642f..5b2d4129 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -199,11 +199,13 @@ public class JwtUtil { } //update-begin---author:chenrui ---date:20250107 for:[QQYUN-10785]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ // 是否存在字符串标志 - boolean multiStr = false; + boolean multiStr; if(oConvertUtils.isNotEmpty(key) && key.trim().matches("^\\[\\w+]$")){ key = key.substring(1,key.length()-1); multiStr = true; - } + } else { + multiStr = false; + } //update-end---author:chenrui ---date:20250107 for:[QQYUN-10785]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ //替换为当前系统时间(年月日) if (key.equals(DataBaseConstant.SYS_DATE)|| key.toLowerCase().equals(DataBaseConstant.SYS_DATE_TABLE)) { @@ -286,7 +288,15 @@ public class JwtUtil { //update-begin---author:chenrui ---date:20250107 for:[QQYUN-10785]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ returnValue = user.getSysMultiOrgCode().stream() .filter(Objects::nonNull) - .map(orgCode -> "'" + orgCode + "'") + //update-begin---author:chenrui ---date:20250224 for:[issues/7288]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ + .map(orgCode -> { + if (multiStr) { + return "'" + orgCode + "'"; + } else { + return orgCode; + } + }) + //update-end---author:chenrui ---date:20250224 for:[issues/7288]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ .collect(Collectors.joining(", ")); //update-end---author:chenrui ---date:20250107 for:[QQYUN-10785]数据权限,查看自己拥有部门的权限中存在问题 #7288------------ }