From c32a19b1bb81cb2181fa9d9aa48bc6cb0e952f60 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 18:26:17 +0800
Subject: [PATCH] 处理相同权限
---
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
index 39d5648..cd5165d 100644
--- a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
@@ -2,11 +2,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.BaseComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.front.smo.IPrivilegeServiceSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
-import com.java110.core.component.BaseComponentSMO;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -223,10 +224,34 @@
return privileges;
}
+
JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());
+ JSONArray privilegeArrays = resultObj.getJSONArray("privileges");
+ JSONObject privilegeObj = null;
- return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(), HttpStatus.OK);
+ JSONArray tmpPrivilegeArrays = new JSONArray();
+
+ for (int privilegeIndex = 0; privilegeIndex < privilegeArrays.size(); privilegeIndex++) {
+ privilegeObj = privilegeArrays.getJSONObject(privilegeIndex);
+ hasSameData(privilegeObj, tmpPrivilegeArrays);
+ }
+ return new ResponseEntity<String>(tmpPrivilegeArrays.toJSONString(), HttpStatus.OK);
+ }
+
+ private void hasSameData(JSONObject privilegeObj, JSONArray tmpPrivilegeArrays) {
+ JSONObject tmpPrivilegeObj = null;
+ for (int tmpPrivilegeIndex = 0; tmpPrivilegeIndex < tmpPrivilegeArrays.size(); tmpPrivilegeIndex++) {
+ tmpPrivilegeObj = tmpPrivilegeArrays.getJSONObject(tmpPrivilegeIndex);
+ if (privilegeObj.getString("pId").equals(tmpPrivilegeObj.getString("pId"))) {
+ if (!StringUtil.isEmpty(privilegeObj.getString("pgId"))) {
+ tmpPrivilegeArrays.remove(tmpPrivilegeIndex);
+ tmpPrivilegeArrays.add(privilegeObj);
+ }
+ return;
+ }
+ }
+ tmpPrivilegeArrays.add(privilegeObj);
}
@Override
--
Gitblit v1.8.0