修改 sys_role.is_enabled

gis_admin/src/main/java/com/gis/admin/entity/po/SysRoleEntity.java

@@ -38,8 +38,11 @@ public class SysRoleEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "排序")
     private String sort;
 
-    @ApiModelProperty(value = "状态 0:启用(默认值)  1：禁用")
-    private Integer isDisable;
+//    @ApiModelProperty(value = "状态 0:启用(默认值)  1：禁用")
+//    private Integer isDisable;
+
+    @ApiModelProperty(value = "是否启动 0: 禁用  1：启用(默认值)")
+    private Integer isEnabled;
 
     @Transient
     @ApiModelProperty(value = "该角色的用户数")

gis_admin/src/main/java/com/gis/admin/mapper/SysRoleMapper.java

@@ -34,8 +34,8 @@ public interface SysRoleMapper extends IBaseMapper<SysRoleEntity, Long> {
     @Insert(value = "insert into sys_user_role (user_id, role_id) values (#{userId}, #{roleId})")
     void saveUserRole(Long userId, Long roleId);
 
-    @Update("update sys_role set is_disable = #{isDisable} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setIsDisable(Long id, Integer isDisable);
+    @Update("update sys_role set is_enabled = #{isDisable} , update_time = NOW() where is_delete=0 and id = #{id} ")
+    void setIsEnabled(Long id, Integer isDisable);
 
 //    @Select("SELECT a.*, count(*) as count " +
 //            "FROM sys_role a left JOIN sys_user_role b on b.role_id=a.id WHERE a.is_delete=0  GROUP BY a.id ")

gis_admin/src/main/java/com/gis/admin/service/impl/SysRoleServiceImpl.java

@@ -165,7 +165,7 @@ public class SysRoleServiceImpl extends IBaseServiceImpl<SysRoleEntity, Long> im
 
     @Override
     public Result editStatus(Long id, Integer isDisable) {
-        entityMapper.setIsDisable(id, isDisable);
+        entityMapper.setIsEnabled(id, isDisable);
         return Result.success();
     }
 

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -187,8 +187,9 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
             return Result.failure("用户不存在");
         }
 
-        List tokenRole = getTokenRole();
-        if (tokenRole.contains("sys_admin")) {
+//        List tokenRole = getTokenRole();
+        Set<String> roleKey = sysRoleService.findRoleKeyByUserId(user.getId());
+        if (roleKey.contains("sys_admin")) {
             log.error("管理员账户不能停用/注销： {}", id);
             return Result.failure("管理员账户不能停用/注销");
         }