From a43e44fed705f60519b865b48f13a3d3196453b4 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 21 Sep 2020 14:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/StaffRoleController.java    | 3 ++-
 .../modules/flow/service/impl/StaffRoleServiceImpl.java   | 8 ++++++++
 .../java/com/lz/modules/sys/entity/SysUserEntity.java     | 8 ++++++++
 .../modules/sys/service/impl/SysUserTokenServiceImpl.java | 1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
index b25ca621..3e9e4eae 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
@@ -1,6 +1,7 @@
 package com.lz.modules.app.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.lz.common.utils.NumberUtil;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.modules.app.entity.DepartmentsEntity;
@@ -144,7 +145,7 @@ public class StaffRoleController {
         if (req.getId() != null && req.getId() > 0) {
             List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());
             for(StaffRoleDepartment staffRoleDepartment : staffRoleDepartments){
-                if(!menuIdList.contains(staffRoleDepartment.getDepartmentId())){
+                if(!menuIdList.contains(NumberUtil.objToLong(staffRoleDepartment.getDepartmentId()))){
                     // 删除没有选的部门
                     staffRoleDepartmentService.deleteStaffRoleDepartment(staffRoleDepartment.getId());
                 }
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index 4574120b..65bc2c78 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -166,10 +166,18 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             role.setRoleId(staffRole.getId());
             role.setRoleName(staffRole.getDepartmentLevel());
             for(StaffRoleDepartment staffRoleDepartment: staffRoleDepartments){
+                if(staffRoleDepartment.getDepartmentId().equals("379454542")
+                || staffRoleDepartment.getDepartmentId().equals("154274609")){
+                    continue;
+                }
                 menuIdList.add(NumberUtil.objToLongDefault(staffRoleDepartment.getDepartmentId(),0l));
             }
         }
+        menuIdList.add(-666666l);
+        menuIdList.add(379454542l);
+        menuIdList.add(154274609l);
         role.setMenuIdList(menuIdList);
+
         return role;
     }
 
diff --git a/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java b/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java
index 1c7b8952..d49729d2 100644
--- a/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java
+++ b/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java
@@ -103,4 +103,12 @@ public class SysUserEntity implements Serializable {
 	private Date createTime;
 
 	private int type ;// 0  表示系统用户，1 表示普通员工
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
 }
diff --git a/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java
index bc5b9f35..f10e214b 100644
--- a/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java
@@ -55,6 +55,7 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
 			tokenEntity.setToken(token);
 			tokenEntity.setUpdateTime(now);
 			tokenEntity.setExpireTime(expireTime);
+			tokenEntity.setType(user.getType());
 			//更新token
 			this.updateById(tokenEntity);
 		}