From 2bcbf32c439a5d7fbb20234b86e410347d5b806f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 15 四月 2023 16:04:48 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 56 +++++++++++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 8f27f1b..92428e1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -84,24 +84,7 @@
//閫楀彿闅斿紑寰楀埌濡備笅涓诧細3{2007 2018 2015}
String[] authorityList = secondFamilyAuthority.split(",");
for (String authorityAndId : authorityList) {
-
- //寰楀埌鏉冮檺涓�
- String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
-
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- }
- }
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId);
}
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
@@ -110,31 +93,15 @@
}
}else{
- String authorities = secondFamilyAuthority.substring(2, secondFamilyAuthority.length() - 1);
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- }
- }
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
if (secondFamilyIdsBuffer.length() > 1) {
secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
}
}
-
}
//灏哠tringBuffer杞垚String
String secondFamilyIds = secondFamilyIdsBuffer.toString();
-
//绗竴瀹跺涵鍙风殑鏉′欢
if (familyIds.contains(",")) {
@@ -183,6 +150,25 @@
return lqw;
}
+ private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) {
+ //寰楀埌鏉冮檺涓�
+ String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
+
+ if (authorities.contains(" ")) {
+ //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
+ String[] authorityIdList = authorities.split(" ");
+ for (String s : authorityIdList) {
+ if (s.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ break;
+ }
+ }
+ } else {
+ if (authorities.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ }
+ }
+ }
private ZInfoUser getMySelf() {
SysUser user = SecurityUtils.getLoginUser().getUser();
--
Gitblit v1.9.1