处理相同权限

service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java

@@ -2,11 +2,12 @@ package com.java110.front.smo.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-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.core.context.IPageData;
 import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+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 @@ public class PrivilegeServiceSMOImpl extends BaseComponentSMO implements IPrivil
             return privileges;
         }
 
+
         JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());
 
+        JSONArray privilegeArrays = resultObj.getJSONArray("privileges");
+        JSONObject privilegeObj = null;
+
+        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);
+    }
 
-        return new ResponseEntity<String>(resultObj.getJSONArray("privileges").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