From cbffba3d267493de955c573f86cf3e347b631a76 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Tue, 14 Apr 2020 14:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PrivilagePermissionServiceImpl.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
index ab52ff4..6c0c372 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
@@ -2,6 +2,7 @@ package com.kiisoo.ic.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.system.bean.LoginPermissionBean;
 import com.kiisoo.ic.system.bean.PermissionBean;
 import com.kiisoo.ic.system.bean.PermissionBiggestBean;
@@ -174,7 +175,9 @@ public class PrivilagePermissionServiceImpl extends ServiceImpl<PrivilagePermiss
             if(permissionOutPut.getCheckArr() == null || permissionOutPut.getCheckArr().size() == 0) return;
             //添加需要添加的权限集合
             addPermissionIdList.add(permissionOutPut.getId());
-            addPermissionIdList.add(permissionOutPut.getParentId());
+            if(permissionOutPut.getParentId() != null) {
+                addPermissionIdList.add(permissionOutPut.getParentId());
+            }
             addPermissionIdList.addAll(permissionOutPut.getCheckArr());
             permissionOutPut.getSonPermissionList().forEach(permissionOutPut1 -> {
                 //没有权限
@@ -191,6 +194,8 @@ public class PrivilagePermissionServiceImpl extends ServiceImpl<PrivilagePermiss
             privilageRolePermissionDO.setPermissionId(permissionId);
             privilageRolePermissionDO.setRoleId(roleId);
             privilageRolePermissionDO.setCreateTime(new Date());
+            privilageRolePermissionDO.setCreateBy(Constants.SYS_OPERATION);
+            privilageRolePermissionDO.setUpdateBy(Constants.SYS_OPERATION);
             privilageRolePermissionDOMapper.insert(privilageRolePermissionDO);
         });
         return false;