fix:修复bug

admin-ui/src/views/index.vue

@@ -4,7 +4,7 @@
       <span style="font-size: 19px">欢迎使用岑溪人民医院随访系统</span>
       <iframe allowtransparency="true" frameborder="0" width="180" height="36" scrolling="no" style="padding-top: 10px" src="//tianqi.2345.com/plugin/widget/index.htm?s=3&z=2&t=0&v=0&d=2&bd=0&k=&f=#545555&ltf=#545555&htf=ffffff&q=1&e=1&a=1&c=72036&w=180&h=36&align=center"></iframe>
     </div>
-    <div class="chart-wrapper" v-if="user.roleName == '医生'">
+    <div class="chart-wrapper" v-if="user.roleName == '医生'||user.roleName == '科室主任'">
       <!--个人形象-->
       <div class="pop" style="width: 65%">
         <div class="out">

admin-ui/src/views/system/role/index.vue

@@ -25,19 +25,20 @@
     </el-row>
     <el-table :data="roleList" border @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色名称" prop="roleName" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="角色名称" prop="roleName" align="center" width="220"/>
+      <el-table-column label="角色备注" prop="remark" align="center"/>
       <el-table-column label="权限字符" prop="roleKey" align="center" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="状态" align="center" width="100">
+      <el-table-column label="状态" align="center" width="120">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200">
+      <el-table-column label="操作" align="center" width="220">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">删除</el-button>
@@ -79,7 +80,7 @@
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id" :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候" :props="defaultProps"></el-tree>
         </el-form-item>
-        <el-form-item label="备注"><el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input></el-form-item>
+        <el-form-item label="备注"><el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3"></el-input></el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -176,7 +177,9 @@ export default {
         pageSize: 10,
         roleName: undefined,
         roleKey: undefined,
-        status: undefined
+        status: undefined,
+        orderByColumn: 'r.create_time', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -109,7 +109,7 @@ public class SysRoleController extends BaseController {
         role.setUpdateBy(getUsername());
 
         if (roleService.updateRole(role) > 0) {
-            permissionService.refreshRolePermission(role.getRoleId());
+            permissionService.refreshRolePermission(role.getRoleId(),role.getDataScope());
             return AjaxResult.success();
         }
         return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
@@ -124,7 +124,11 @@ public class SysRoleController extends BaseController {
     public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-        return toAjax(roleService.authDataScope(role));
+        int row=roleService.authDataScope(role);
+        if(row>0){
+            permissionService.refreshRolePermission(role.getRoleId(),role.getDataScope());
+        }
+        return toAjax(row);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/FollowRecordServiceImpl.java

@@ -38,7 +38,7 @@ public class FollowRecordServiceImpl extends ServiceImpl<FollowRecordMapper, Fol
     @Autowired
     private Environment env;
 
-    @DataScope(deptAlias = "k")
+    @DataScope(deptAlias = "k",userAlias = "k")
     @Override
     public List<FollowRecord> selectList(FollowRecord followRecord) {
         return followRecordMapper.selectList(followRecord);

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/FollowTemplateServiceImpl.java

@@ -19,7 +19,7 @@ public class FollowTemplateServiceImpl extends ServiceImpl<FollowTemplateMapper,
     @Autowired
     private FollowTemplateMapper followTemplateMapper;
 
-    @DataScope(deptAlias = "k")
+    @DataScope(deptAlias = "k",userAlias = "k")
     @Override
     public List<FollowTemplate> selectList(FollowTemplate followTemplate) {
         return followTemplateMapper.selectList(followTemplate);

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/KnowledgeServiceImpl.java

@@ -32,7 +32,7 @@ public class KnowledgeServiceImpl extends ServiceImpl<KnowledgeMapper, Knowledge
     }
 
     @Override
-    @DataScope(deptAlias = "k")
+    @DataScope(deptAlias = "k",userAlias = "k")
     public List<Knowledge> selectList(Knowledge knowledge) {
         knowledge.setState(0);
         return knowledgeMapper.selectList(knowledge);

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

@@ -1,21 +1,20 @@
 package com.ruoyi.framework.web.service;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.system.service.ISysMenuService;
-import com.ruoyi.system.service.ISysRoleService;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 用户权限处理
@@ -88,13 +87,16 @@ public class SysPermissionService {
      *
      * @param roleId
      */
-    public void refreshRolePermission(Long roleId) {
+    public void refreshRolePermission(Long roleId,String...dataScope) {
         Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
         for (String key : keys) {
             LoginUser loginUser = redisCache.getCacheObject(key);
             if (loginUser != null) {
                 for (SysRole r : loginUser.getUser().getRoles()) {
                     if (r.getRoleId().equals(roleId)) {
+                        if(dataScope.length>0){
+                            r.setDataScope(dataScope[0]);
+                        }
                         loginUser.setPermissions(getMenuPermission(loginUser.getUser()));
                         tokenService.setLoginUser(loginUser);
                     }