新需求修改
This commit is contained in:
parent
8dd2edf13f
commit
16b7ac95c6
|
|
@ -14,7 +14,7 @@ const user = {
|
||||||
permissions: [],
|
permissions: [],
|
||||||
iscUserId: '',
|
iscUserId: '',
|
||||||
knowId: '',
|
knowId: '',
|
||||||
permsKnow: ''
|
permsKnow: []
|
||||||
},
|
},
|
||||||
|
|
||||||
mutations: {
|
mutations: {
|
||||||
|
|
|
||||||
|
|
@ -203,6 +203,7 @@ export default {
|
||||||
next(); // 必须调用next()来解决路由守卫的promise
|
next(); // 必须调用next()来解决路由守卫的promise
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
this.permsKnow.push(this.knowId)
|
||||||
this.$refs.chatContent.style.display="none"
|
this.$refs.chatContent.style.display="none"
|
||||||
//this.getKnowledgeMes();
|
//this.getKnowledgeMes();
|
||||||
//this.scrollToBottom();
|
//this.scrollToBottom();
|
||||||
|
|
|
||||||
|
|
@ -186,8 +186,8 @@
|
||||||
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> -->
|
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> -->
|
||||||
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
|
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
|
||||||
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
||||||
<el-dropdown-item command="updateRoleKnowId" icon="el-icon-setting"
|
<!-- <el-dropdown-item command="updateRoleKnowId" icon="el-icon-setting"
|
||||||
v-hasPermi="['system:user:updateRoleKnowId']">知识库配置</el-dropdown-item>
|
v-hasPermi="['system:user:updateRoleKnowId']">知识库配置</el-dropdown-item>-->
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -241,9 +241,6 @@ public class SysLoginController {
|
||||||
permsKnow.addAll(Arrays.asList(perm.getKnowId().trim().split(",")));
|
permsKnow.addAll(Arrays.asList(perm.getKnowId().trim().split(",")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ObjectUtils.isNotEmpty(user.getKnowId())) {
|
|
||||||
permsKnow.addAll(Arrays.asList(user.getKnowId().trim().split(",")));
|
|
||||||
}
|
|
||||||
List<String> knowIds = permissionService.getKnowIds();
|
List<String> knowIds = permissionService.getKnowIds();
|
||||||
permsKnow.addAll(knowIds);
|
permsKnow.addAll(knowIds);
|
||||||
// 权限集合
|
// 权限集合
|
||||||
|
|
@ -373,7 +370,7 @@ public class SysLoginController {
|
||||||
// 资源获取接口
|
// 资源获取接口
|
||||||
SysUser sysuser = new SysUser();
|
SysUser sysuser = new SysUser();
|
||||||
sysuser.setIscUserId("sdsdfsf3434324234abc");
|
sysuser.setIscUserId("sdsdfsf3434324234abc");
|
||||||
sysuser.setUserName("test123");
|
sysuser.setUserName("test1234");
|
||||||
sysuser.setDeptId(105L);
|
sysuser.setDeptId(105L);
|
||||||
sysuser.setNickName(sysuser.getUserName());
|
sysuser.setNickName(sysuser.getUserName());
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ public class SysPermissionService {
|
||||||
|
|
||||||
|
|
||||||
public String getKnowId(SysUser user) {
|
public String getKnowId(SysUser user) {
|
||||||
return mapper.getKnowId(user.getUserId());
|
return mapper.getKnowId(user.getUserName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ public interface KnowledgeMapper {
|
||||||
@MapKey("key")
|
@MapKey("key")
|
||||||
List<Map<String,Object>> getKnowList();
|
List<Map<String,Object>> getKnowList();
|
||||||
|
|
||||||
String getKnowId(Long userId);
|
String getKnowId(String userId);
|
||||||
|
|
||||||
List<String> getKnowIds();
|
List<String> getKnowIds();
|
||||||
@MapKey("id")
|
@MapKey("id")
|
||||||
|
|
|
||||||
|
|
@ -91,23 +91,22 @@
|
||||||
limit 1
|
limit 1
|
||||||
</select>
|
</select>
|
||||||
<select id="getKnowList" resultType="java.util.Map">
|
<select id="getKnowList" resultType="java.util.Map">
|
||||||
select id AS 'key',
|
select id AS 'key', know_name AS 'label'
|
||||||
know_name AS 'label'
|
|
||||||
from bm_knowledge
|
from bm_knowledge
|
||||||
where is_active = '0' and know_type not in (2,3)
|
where is_active = '0'
|
||||||
|
and know_type not in (1,2)
|
||||||
</select>
|
</select>
|
||||||
<select id="getKnowId" resultType="java.lang.String">
|
<select id="getKnowId" resultType="java.lang.String">
|
||||||
select id
|
select id
|
||||||
from bm_knowledge
|
from bm_knowledge
|
||||||
where is_active = '0'
|
where is_active = '0'
|
||||||
AND user_id = #{userId}
|
AND know_name = #{userId}
|
||||||
</select>
|
</select>
|
||||||
<select id="getKnowIds" resultType="java.lang.String">
|
<select id="getKnowIds" resultType="java.lang.String">
|
||||||
select id
|
select id
|
||||||
from bm_knowledge
|
from bm_knowledge
|
||||||
where is_active = '0'
|
where is_active = '0'
|
||||||
and know_type = '1'
|
and know_type = '1'
|
||||||
AND user_id = #{userId}
|
|
||||||
</select>
|
</select>
|
||||||
<select id="getKnowListMessage" resultType="java.util.Map">
|
<select id="getKnowListMessage" resultType="java.util.Map">
|
||||||
select bk.id AS 'id',
|
select bk.id AS 'id',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue