From 4398a02bf8543e73a716dee14b3ba4af56c6b9f8 Mon Sep 17 00:00:00 2001
From: 康鲁杰 <60095866+KangLujie@users.noreply.github.com>
Date: 星期三, 18 六月 2025 10:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
ruoyi-ui/apps/web-antd/src/views/work/statistics/index.vue | 13 ++++++
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java | 11 +++++
ruoyi-ui/apps/web-antd/src/views/assessment/serviceRating/index.vue | 13 ++++++
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java | 3 +
ruoyi-ui/apps/web-antd/src/views/work/Issued/index.vue | 13 ++++++
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java | 3 +
ruoyi-ui/apps/web-antd/src/views/work/myWork/index.vue | 13 ++++++
ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java | 13 ++++--
8 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java
index aa8967a..cffdc53 100644
--- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java
+++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java
@@ -1,5 +1,6 @@
package org.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -16,7 +17,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName("chat_session")
+@TableName("CHAT_SESSION")
public class ChatSession extends BaseEntity {
@Serial
@@ -25,28 +26,30 @@
/**
* 涓婚敭
*/
- @TableId(value = "id")
+ @TableId(value = "ID")
private Long id;
/**
- * 鐢ㄦ埛id
+ * 鐢ㄦ埛ID
*/
+ @TableField("USER_ID")
private Long userId;
/**
* 浼氳瘽鏍囬
*/
+ @TableField("SESSION_TITLE")
private String sessionTitle;
/**
* 浼氳瘽鍐呭
*/
+ @TableField("SESSION_CONTENT")
private String sessionContent;
/**
* 澶囨敞
*/
+ @TableField("REMARK")
private String remark;
-
-
}
diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java
index a924688..5cfb993 100644
--- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java
+++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java
@@ -17,7 +17,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName("knowledge_info")
+@TableName("KNOWLEDGE_INFO")
public class KnowledgeInfo extends BaseEntity {
@Serial
@@ -27,6 +27,7 @@
* 涓婚敭ID
*/
@TableId(value = "ID")
+ @TableField("ID")
private Long id;
/**
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java
index 4a04827..efb587d 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java
@@ -177,7 +177,8 @@
@Transactional(rollbackFor = Exception.class)
public void removeKnowledge(String id) {
Map<String,Object> map = new HashMap<>();
- KnowledgeInfo knowledgeInfo = baseMapper.selectById(id);
+ KnowledgeInfo knowledgeInfo = baseMapper.selectOne(new LambdaQueryWrapper<KnowledgeInfo>()
+ .eq(KnowledgeInfo::getKid, id));
check(knowledgeInfo);
map.put("kid",knowledgeInfo.getKid());
// 鍒犻櫎鍚戦噺鏁版嵁
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java
index 04e5c0d..30babe9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java
@@ -322,4 +322,15 @@
return R.ok(trees);
}
+ /**
+ * 鑾峰彇閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴蜂俊鎭�
+ */
+ @SaCheckPermission("system:user:list")
+ @GetMapping("/list/dept/{deptId}")
+ public R<List<SysUserVo>> listByDeptId(@PathVariable Long deptId) {
+ List<SysUserVo> sysUserVos = userService.selectUserList(new SysUserBo());
+ return R.ok(sysUserVos.stream()
+ .filter(user -> deptId.equals(user.getDeptId()))
+ .collect(Collectors.toList()));
+ }
}
diff --git a/ruoyi-ui/apps/web-antd/src/views/assessment/serviceRating/index.vue b/ruoyi-ui/apps/web-antd/src/views/assessment/serviceRating/index.vue
new file mode 100644
index 0000000..76dfc47
--- /dev/null
+++ b/ruoyi-ui/apps/web-antd/src/views/assessment/serviceRating/index.vue
@@ -0,0 +1,13 @@
+<template>
+<div>宸ヤ綔鑰冩牳鎸囨爣</div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/ruoyi-ui/apps/web-antd/src/views/work/Issued/index.vue b/ruoyi-ui/apps/web-antd/src/views/work/Issued/index.vue
new file mode 100644
index 0000000..d884f8b
--- /dev/null
+++ b/ruoyi-ui/apps/web-antd/src/views/work/Issued/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>宸ヤ綔涓嬪彂</div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/ruoyi-ui/apps/web-antd/src/views/work/myWork/index.vue b/ruoyi-ui/apps/web-antd/src/views/work/myWork/index.vue
new file mode 100644
index 0000000..7dabebf
--- /dev/null
+++ b/ruoyi-ui/apps/web-antd/src/views/work/myWork/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>鎴戠殑宸ヤ綔</div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/ruoyi-ui/apps/web-antd/src/views/work/statistics/index.vue b/ruoyi-ui/apps/web-antd/src/views/work/statistics/index.vue
new file mode 100644
index 0000000..f5bd867
--- /dev/null
+++ b/ruoyi-ui/apps/web-antd/src/views/work/statistics/index.vue
@@ -0,0 +1,13 @@
+<template>
+<div>宸ヤ綔缁熻</div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.3