diff --git a/LargeScreenDisplay(1)/src/store/modules/user.js b/LargeScreenDisplay(1)/src/store/modules/user.js
index 30b6688..22502e0 100644
--- a/LargeScreenDisplay(1)/src/store/modules/user.js
+++ b/LargeScreenDisplay(1)/src/store/modules/user.js
@@ -14,7 +14,7 @@ const user = {
permissions: [],
iscUserId: '',
knowId: '',
- permsKnow: ''
+ permsKnow: []
},
mutations: {
diff --git a/LargeScreenDisplay(1)/src/views/chatMain/chatMain.vue b/LargeScreenDisplay(1)/src/views/chatMain/chatMain.vue
index 073edc1..5f8ce53 100644
--- a/LargeScreenDisplay(1)/src/views/chatMain/chatMain.vue
+++ b/LargeScreenDisplay(1)/src/views/chatMain/chatMain.vue
@@ -203,6 +203,7 @@ export default {
next(); // 必须调用next()来解决路由守卫的promise
},
mounted() {
+ this.permsKnow.push(this.knowId)
this.$refs.chatContent.style.display="none"
//this.getKnowledgeMes();
//this.scrollToBottom();
diff --git a/LargeScreenDisplay(1)/src/views/system/user/index.vue b/LargeScreenDisplay(1)/src/views/system/user/index.vue
index 3d6d858..562a0d4 100644
--- a/LargeScreenDisplay(1)/src/views/system/user/index.vue
+++ b/LargeScreenDisplay(1)/src/views/system/user/index.vue
@@ -186,8 +186,8 @@
v-hasPermi="['system:user:resetPwd']">重置密码 -->
分配角色
- 知识库配置
+
diff --git a/LargeScreenServer(1)/large-admin/src/main/java/com/bonus/web/controller/system/SysLoginController.java b/LargeScreenServer(1)/large-admin/src/main/java/com/bonus/web/controller/system/SysLoginController.java
index 2278b0a..31d04c2 100644
--- a/LargeScreenServer(1)/large-admin/src/main/java/com/bonus/web/controller/system/SysLoginController.java
+++ b/LargeScreenServer(1)/large-admin/src/main/java/com/bonus/web/controller/system/SysLoginController.java
@@ -241,9 +241,6 @@ public class SysLoginController {
permsKnow.addAll(Arrays.asList(perm.getKnowId().trim().split(",")));
}
}
- if (ObjectUtils.isNotEmpty(user.getKnowId())) {
- permsKnow.addAll(Arrays.asList(user.getKnowId().trim().split(",")));
- }
List knowIds = permissionService.getKnowIds();
permsKnow.addAll(knowIds);
// 权限集合
@@ -373,7 +370,7 @@ public class SysLoginController {
// 资源获取接口
SysUser sysuser = new SysUser();
sysuser.setIscUserId("sdsdfsf3434324234abc");
- sysuser.setUserName("test123");
+ sysuser.setUserName("test1234");
sysuser.setDeptId(105L);
sysuser.setNickName(sysuser.getUserName());
try {
diff --git a/LargeScreenServer(1)/large-framework/src/main/java/com/bonus/framework/web/service/SysPermissionService.java b/LargeScreenServer(1)/large-framework/src/main/java/com/bonus/framework/web/service/SysPermissionService.java
index 100ab09..2071a23 100644
--- a/LargeScreenServer(1)/large-framework/src/main/java/com/bonus/framework/web/service/SysPermissionService.java
+++ b/LargeScreenServer(1)/large-framework/src/main/java/com/bonus/framework/web/service/SysPermissionService.java
@@ -75,7 +75,7 @@ public class SysPermissionService {
public String getKnowId(SysUser user) {
- return mapper.getKnowId(user.getUserId());
+ return mapper.getKnowId(user.getUserName());
}
diff --git a/LargeScreenServer(1)/large-system/src/main/java/com/bonus/system/mapper/KnowledgeMapper.java b/LargeScreenServer(1)/large-system/src/main/java/com/bonus/system/mapper/KnowledgeMapper.java
index e34a4ad..855deae 100644
--- a/LargeScreenServer(1)/large-system/src/main/java/com/bonus/system/mapper/KnowledgeMapper.java
+++ b/LargeScreenServer(1)/large-system/src/main/java/com/bonus/system/mapper/KnowledgeMapper.java
@@ -86,7 +86,7 @@ public interface KnowledgeMapper {
@MapKey("key")
List