累积更新

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -64,6 +64,9 @@ public class SysProfileController extends BaseController
         currentUser.setNickName(user.getNickName());
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setHomePlace(user.getHomePlace());
+        currentUser.setContact(user.getContact());
+        currentUser.setTelephone(user.getTelephone());
         currentUser.setSex(user.getSex());
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
         {

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -80,10 +80,10 @@ public class McpServiceImpl implements IMcpService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalStateException("Milvus service URL 未配置");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
@@ -220,7 +220,7 @@ public class McpServiceImpl implements IMcpService {
      */
     public String generateAnswer(String prompt) throws IOException {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5")
+                .model("Qwen")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/McpController.java

@@ -60,7 +60,7 @@ public class McpController extends BaseController
                 .url("http://localhost:8080/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5")
+                .model("Qwen")
                 .defaultToolsAdd(clientProvider)
                 .build();
 

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/SessionController.java

@@ -17,11 +17,13 @@ import org.noear.solon.ai.mcp.client.McpClientProvider;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
+import javax.annotation.PostConstruct;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,20 +47,30 @@ public class SessionController extends BaseController
     @Value("${llmService.url}")
     private String llmServiceUrl;
 
-    /**
-     * 生成回答
-     */
-    @GetMapping("/answer")
-    public Flux<AssistantMessage> answer(String topicId, String question) throws IOException {
-        McpClientProvider clientProvider = McpClientProvider.builder()
+    // 复用 ChatModel 实例
+    private ChatModel chatModel;
+    private McpClientProvider clientProvider;
+
+    @PostConstruct
+    public void init() {
+        // 初始化 McpClientProvider
+        clientProvider = McpClientProvider.builder()
                 .channel(McpChannel.SSE)
                 .url("http://localhost:8080/mcp/sse")
                 .build();
-        ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5")
+
+        // 初始化 ChatModel
+        chatModel = ChatModel.of(llmServiceUrl)
+                .model("Qwen")
                 .defaultToolsAdd(clientProvider)
                 .build();
+    }
 
+    /**
+     * 生成回答
+     */
+    @GetMapping(value = "/answer", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<AssistantMessage> answer(String topicId, String question) throws IOException {
         List<ChatMessage> messages = new ArrayList<>();
         CmcChat cmcChat = new CmcChat();
         cmcChat.setTopicId(topicId);
@@ -96,32 +108,51 @@ public class SessionController extends BaseController
                 "7. 输出格式：使用[]包含sql文本，例如:[select 1 from dual]\n";
         messages.add(ChatMessage.ofUser(prompt));
         ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
-        ChatResponse response = chatModel.prompt(chatSession).call();
-        String resultContent = response.lastChoice().getMessage().getResultContent();
-
-        if (resultContent.contains("<tool_call>")) {
-            resultContent = resultContent.split("<tool_call>\n")[1];
-            String content = resultContent.replace("\n</tool_call>", "");
-            JSONObject jsonObject = JSONObject.parseObject(content);
-            String name = jsonObject.getString("name");
-            JSONObject arguments = jsonObject.getJSONObject("arguments");
-            resultContent = clientProvider.callToolAsText(name, arguments).getContent();
-            resultContent = "根据查询结果：\n" +
-                    resultContent + "回答问题：\n" +
-                    question + " \n";
-            return langChainMilvusService.generateAnswer(topicId, resultContent);
-        } else {
-            // 不需要调用工具，直接返回原始响应，避免重复调用大模型
-            // 创建一个包含原始响应内容的 AssistantMessage 并返回 Flux
-            AssistantMessage assistantMessage = ChatMessage.ofAssistant(resultContent);
-            return Flux.just(assistantMessage);
-        }
+
+        Publisher<ChatResponse> responsePublisher = chatModel.prompt(chatSession).stream();
+
+        // 收集完整的响应内容，用于判断是否需要工具调用
+        StringBuilder resultBuilder = new StringBuilder();
+
+        // 先创建一个处理器，用于处理流式响应
+        Flux<AssistantMessage> flux = Flux.from(responsePublisher)
+                .map(chatResponse -> chatResponse.lastChoice().getMessage())
+                .doOnNext(assistantMessage -> {
+                    String content = assistantMessage.getResultContent();
+                    resultBuilder.append(content);
+                });
+
+        // 检查是否需要工具调用（异步处理）
+        return flux.thenMany(Flux.defer(() -> {
+            String resultContent = resultBuilder.toString();
+
+            if (resultContent.contains("<tool_call>")) {
+                // 需要工具调用，解析工具调用内容
+                resultContent = resultContent.split("<tool_call>\n")[1];
+                String content = resultContent.replace("\n</tool_call>", "");
+                JSONObject jsonObject = JSONObject.parseObject(content);
+                String name = jsonObject.getString("name");
+                JSONObject arguments = jsonObject.getJSONObject("arguments");
+
+                // 调用工具
+                resultContent = clientProvider.callToolAsText(name, arguments).getContent();
+                resultContent = "根据查询结果：\n" +
+                        resultContent + "回答问题：\n" +
+                        question + " \n";
+
+                // 再次调用LLM生成最终回答
+                return langChainMilvusService.generateAnswer(topicId, resultContent);
+            } else {
+                // 不需要工具调用，已经通过上面的flux返回了流式内容
+                return Flux.just(ChatMessage.ofAssistant(resultContent));
+            }
+        }));
     }
 
     /**
      * 调用LLM+RAG（外部文件）生成回答
      */
-    @GetMapping("/answerWithDocument")
+    @GetMapping(value = "/answerWithDocument", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception
     {
         return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question);

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -74,16 +74,27 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     private String milvusServiceUrl;
 
     private MilvusClientV2 milvusClient;
+    
+    // 复用 ChatModel 实例
+    private ChatModel chatModel;
 
     @PostConstruct
     public void initMilvusClient() {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
+    }
+    
+    @PostConstruct
+    public void initChatModel() {
+        // 初始化 ChatModel
+        chatModel = ChatModel.of(llmServiceUrl)
+                .model("Qwen")
+                .build();
     }
 
     /**
@@ -242,11 +253,6 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      */
     @Override
     public Flux<AssistantMessage> generateAnswer(String topicId, String prompt) {
-        ChatModel chatModel = ChatModel.of(llmServiceUrl)
-
-                .model("Qwen2.5")
-                .build();
-
         List<ChatMessage> messages = new ArrayList<>();
         if (topicId != null) {
             CmcChat cmcChat = new CmcChat();

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -34,10 +34,10 @@ public class MilvusServiceImpl implements IMilvusService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -90,10 +90,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
 
     /**
@@ -644,7 +644,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      */
     public String generateAnswer(String prompt) throws IOException {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5")
+                .model("Qwen")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();

oa-ui-app/api/qywx/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 发送企业微信消息
 export function sendQyMessage(data) {
   return request({
-    url: '/qywx/message/send',
+    url: '/qyweixin/sendMessage',
     method: 'post',
     data: data
   })

oa-ui-app/pages/form/borrow/borrow.vue

@@ -154,6 +154,8 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listSite, delSite } from "@/api/oa/budget/budgetSite.js";
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { sendQyMessage } from "@/api/qywx/index"
+import { listUser, getUser } from "@/api/system/user";
 import BorrowDetail from './borrowDetail.vue';
 import FlowNote from '@/pages/components/flowNote.vue';
 import ReturnPopup from '@/pages/components/returnPopup.vue';
@@ -179,6 +181,7 @@ export default {
     this.deptId = this.$store.getters.deptId;
     this.applierUserName = this.startUserName;
     this.initForm();
+    this.getUserList();
     this.initRules();
     uni.setNavigationBarTitle({
       title: '借款审批'
@@ -194,6 +197,7 @@ export default {
   },
   data() {
     return {
+      userList: [],
       applierUserName: '',
       form: {
         submitTime: '',
@@ -303,8 +307,8 @@ export default {
       getBorrow(this.taskForm.formId).then(async res => {
         if (res.data) {
           this.formTotal = 1;
-          this.form = res.data;
-          if (this.form.applyDept == 104) //董事长分管的综合事务部，跳过分管审批
+          this.form = res.data;
+          if (this.form.applyDept == 104) //董事长分管的综合事务部，跳过分管审批
             this.need = false;
           if (!this.applierUserName) {
             this.applierUserName = this.form.applierUser.nickName;
@@ -328,6 +332,17 @@ export default {
       })
 
     },
+    // 获取用户列表
+    getUserList() {
+      listUser({
+        pageNum: 1,
+        pageSize: 9999
+      }).then(res => {
+        if (res.code == 200) {
+          this.userList = res.rows
+        }
+      })
+    },
     async getMaxExpense() {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
@@ -469,51 +484,62 @@ export default {
             // 处理不同的流程节点
             if (this.taskName == '借款申请') {
               // 处理借款申请节点
-              await this.borrowApprovalFun();
+              let userId = await this.borrowApprovalFun();
+              let userIds = [];
+              if (userId) {
+                userIds.push(userId);
+              }
+              await this.sendQyMessage(userIds);
             } else if (this.taskName == '部门审核') {
               this.taskForm.variables.need = this.need;
+              let userIds = [];
               if (this.need) {
-				  // 得到分管领导根据部门
-				  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
-				  let userIds = [];
-				  if (res.data) {
-					res.data.forEach(item => {
-					  userIds.push(item.userId)
-					})
-				  }
-				  this.taskForm.variables.approvalList = userIds;
-				  this.handleComplete(this.taskForm);
+			  // 得到分管领导根据部门
+			  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+			  if (res.data) {
+				res.data.forEach(item => {
+				  userIds.push(item.userId)
+				})
 			  }
-			  else {
-				  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
-				  let userIds = [];
-				  if (res.data) {
-					res.data.forEach(item => {
-					  userIds.push(item.userId)
-					})
-				  }
-				  this.taskForm.variables.approvalList = userIds;
-				  const response = await getUserByPost({ postName: '总经理' });
-				  this.taskForm.variables.approval = response.data[0].userId;
-				  this.handleComplete(this.taskForm);
+			  this.taskForm.variables.approvalList = userIds;
+			  this.handleComplete(this.taskForm);
+		  }
+		  else {
+			  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+			  if (res.data) {
+				res.data.forEach(item => {
+				  userIds.push(item.userId)
+				})
 			  }
+			  this.taskForm.variables.approvalList = userIds;
+			  const response = await getUserByPost({ postName: '总经理' });
+			  this.taskForm.variables.approval = response.data[0].userId;
+			  userIds = [response.data[0].userId];
+			  this.handleComplete(this.taskForm);
+		  }
+              await this.sendQyMessage(userIds);
             } else if (this.taskName == '分管审核') {
               // 得到总经理
               const res = await getUserByPost({ postName: '总经理' });
               this.taskForm.variables.approval = res.data[0].userId;
               this.handleComplete(this.taskForm);
+              await this.sendQyMessage([res.data[0].userId]);
             } else if (this.taskName == '总经理审核') {
               this.exceed = false;
               this.taskForm.variables.exceed = this.exceed;
+              let userIds = [];
               if (!this.exceed) {
-                this.submitFD(); // 提交给财务部门
+                userIds = await this.submitFD(); // 提交给财务部门
               } else {
                 const res = await getUserByPost({ postName: '董事长' });
                 this.taskForm.variables.approval = res.data[0].userId;
                 this.handleComplete(this.taskForm);
+                userIds = [res.data[0].userId];
               }
+              await this.sendQyMessage(userIds);
             } else if (this.taskName == '董事长批准' || this.taskName == '党工团审核') {
-              this.submitFD(); // 提交给财务部门
+              let userIds = await this.submitFD(); // 提交给财务部门
+              await this.sendQyMessage(userIds);
             } else if (this.taskName == '财务处理') {
               uni.showModal({
                 title: '提示',
@@ -563,22 +589,25 @@ export default {
         this.form.managerAmount = this.form.applyAmount;
         await updateBorrow(this.form);
         const res = await getUserByPost({ postName: '总经理' });
+        userId = res.data[0].userId;
         this.taskForm.variables.dept = this.deptId;
-        this.taskForm.variables.approval = res.data[0].userId;
+        this.taskForm.variables.approval = userId;
         this.handleComplete(this.taskForm);
       } else if (this.deptId == 101) { //如果是董事会申请，走董事长批准
         const res = await getUserByPost({ postName: '董事长' });
+        userId = res.data[0].userId;
         this.taskForm.variables.dept = this.deptId;
-        this.taskForm.variables.approval = res.data[0].userId;
+        this.taskForm.variables.approval = userId;
         this.taskForm.variables.exceed = true;
         this.handleComplete(this.taskForm);
       } else { //普通员工申请项目借款
         const res = await getUsersDeptLeader({ userId: this.$store.getters.userId });
-        let userId = res.data.userId;
+        userId = res.data.userId;
         this.taskForm.variables.approval = userId;
         this.taskForm.variables.dept = this.deptId;
         this.handleComplete(this.taskForm);
       }
+      return userId;
     },
     // 提交给财务部审核
     async submitFD() {
@@ -589,6 +618,7 @@ export default {
       approvalList.push(res1.data.userId);
       this.taskForm.variables.approvalList = approvalList;
       this.handleComplete(this.taskForm);
+      return approvalList;
     },
     commentByRole() {
       if (this.taskName == '部门审核') {
@@ -613,7 +643,33 @@ export default {
     uploadSuccess(fileName) {
       this.form.borrowDocument = fileName
       updateBorrow(this.form)
-    }
+    },
+    // 发送企业微信消息
+    async sendQyMessage(userIds) {
+      if (userIds && userIds.length > 0) {
+        let formData = new FormData();
+        let message = "您有一条新的借款申请:  \n>" + 
+        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
+        "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
+        "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>";
+        formData.append('message', message);
+        let userString = [];
+        for (let u of userIds) {
+          let { data } = await getUser(u);
+          if (data && data.pinyin) {
+            userString.push(data.pinyin);
+          }
+        }
+        formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+        await sendQyMessage(formData);
+      }
+    },
+    // 获取用户名称
+    getUserName(userId) {
+      if (!userId || !this.userList) return '';
+      let user = this.userList.find(u => u.userId == userId);
+      return user ? user.nickName : '';
+    },
   },
 }
 </script>

oa-ui-app/pages/form/car/car.vue

@@ -184,7 +184,8 @@ import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, mod
 import { listProject, getProject } from "@/api/oa/project/project";
 import { getUserByRole } from "@/api/system/role";
 import { getUsersManageLeader, getUserByPost, getUsersDeptLeader } from '@/api/system/post.js'
-import { getUser } from '@/api/system/user';
+import { listUser, getUser } from "@/api/system/user";
+import { sendQyMessage } from "@/api/qywx/index";
 import FlowNote from '@/pages/components/flowNote.vue';
 import ProjectPicker from '@/pages/components/ProjectPicker.vue';
 import ProjectInfo from '@/pages/components/ProjectInfo.vue';
@@ -259,6 +260,7 @@ export default {
         value: '4',
         disable: false
       }],
+      userList: [],
       dept: 0,
       deptUser: '',
       managerUser: '',
@@ -391,6 +393,7 @@ export default {
   },
   created() {
     this.applierUserName = this.startUserName;
+    this.getUserList();
     this.initForm();
     this.getCarList();
     this.getDriverList();
@@ -444,6 +447,17 @@ export default {
         }
       })
     },
+    // 获取用户列表
+    getUserList() {
+      listUser({
+        pageNum: 1,
+        pageSize: 9999
+      }).then(res => {
+        if (res.code == 200) {
+          this.userList = res.rows
+        }
+      })
+    },
     initAuditor() {
 
     },
@@ -615,42 +629,48 @@ export default {
           });
         };
 
-        const setApprovalAndComplete = (approval) => {
+        const setApprovalAndComplete = async (approval) => {
           this.$set(this.taskForm.variables, "approval", approval);
           handleComplete();
+          await this.sendQyMessage([approval]);
         };
 
-        const setApprovalListAndComplete = (approvalList) => {
+        const setApprovalListAndComplete = async (approvalList) => {
+          let userIds = [];
+          if (Array.isArray(approvalList)) {
+            userIds = approvalList.map(item => typeof item === 'object' ? item.userId : item);
+          }
           this.$set(this.taskForm.variables, "approvalList", approvalList);
           handleComplete();
+          await this.sendQyMessage(userIds);
         };
 
         if (this.taskName == '用车申请') {
           this.$set(this.taskForm.variables, "dept", this.dept);
 
           if (this.dept == 101) {
-            getUserByPost({ postName: '董事长' }).then(result => {
-              setApprovalAndComplete(result.data[0].userId);
+            getUserByPost({ postName: '董事长' }).then(async result => {
+              await setApprovalAndComplete(result.data[0].userId);
             }).catch(error => {
               reject(error);
             });
           } else if (this.dept == 102) {
-            getUserByPost({ postName: '总经理' }).then(result => {
-              setApprovalAndComplete(result.data[0].userId);
+            getUserByPost({ postName: '总经理' }).then(async result => {
+              await setApprovalAndComplete(result.data[0].userId);
             }).catch(error => {
               reject(error);
             });
           } else if (this.dept == 0) {
             const postName = this.getChooseType();
-            getUserByPost({ postName }).then(result => {
-              setApprovalAndComplete(result.data[0].userId);
+            getUserByPost({ postName }).then(async result => {
+              await setApprovalAndComplete(result.data[0].userId);
             }).catch(error => {
               reject(error);
             });
           } else {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(async res => {
               if (res.data) {
-                setApprovalAndComplete(res.data.userId);
+                await setApprovalAndComplete(res.data.userId);
               } else {
                 reject(new Error('未找到部门领导'));
               }
@@ -659,15 +679,15 @@ export default {
             });
           }
         } else if (this.taskName == '部门审核') {
-          getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-            const userId = res.data.map(user => user.userId);
-            setApprovalListAndComplete(userId);
+          getUsersManageLeader({ userId: this.$store.getters.userId }).then(async res => {
+            const userIds = res.data.map(user => user.userId);
+            await setApprovalListAndComplete(userIds);
           }).catch(error => {
             reject(error);
           });
         } else if (['分管审核', '党工团审核', '总经理审核', '董事长审核'].includes(this.taskName)) {
-          getUserByRole({ roleId: 5 }).then(result => {
-            setApprovalListAndComplete(result.data);
+          getUserByRole({ roleId: 5 }).then(async result => {
+            await setApprovalListAndComplete(result.data);
           }).catch(error => {
             reject(error);
           });
@@ -724,6 +744,35 @@ export default {
       // 只允许输入数字
       this.form.kilometers = val.replace(/[^\d]/g, '');
     },
+    // 发送企业微信消息
+    async sendQyMessage(userIds) {
+      if (userIds && userIds.length > 0) {
+        let formData = new FormData();
+        let message = "您有一条新的用车申请:  \n>" + 
+        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
+        "用车事由：" + this.form.applyReason + " \n>" + 
+        "开始日期：" + this.form.beginDate + " \n>" + 
+        "结束日期：" + this.form.endDate + " \n>" + 
+        "乘车人数：" + this.form.passengers + "人  \n>";
+        formData.append('message', message);
+        let userString = [];
+        for (let u of userIds) {
+          let { data } = await getUser(u);
+          if (data && data.pinyin) {
+            userString.push(data.pinyin);
+          }
+        }
+        formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+        await sendQyMessage(formData);
+      }
+    },
+    // 获取用户名称
+    getUserName(userId) {
+      if (!userId || !this.userList) return '';
+      let user = this.userList.find(u => u.userId == userId);
+      return user ? user.nickName : '';
+    },
+
   },
 }
 </script>

oa-ui-app/pages/form/device/device.vue

@@ -268,6 +268,8 @@ import { getProject } from "@/api/oa/project/project";
 import { getDevice } from "@/api/oa/device/device";
 import { getUserByRole } from "@/api/system/role";
 import { getUsersManageLeader } from '@/api/system/post.js'
+import { sendQyMessage } from "@/api/qywx/index";
+import { listUser, getUser } from "@/api/system/user";
 import FlowNote from '@/pages/components/flowNote.vue';
 import ProjectPicker from '@/pages/components/ProjectPicker.vue';
 import ProjectInfo from '@/pages/components/ProjectInfo.vue';
@@ -292,10 +294,12 @@ export default {
   created() {
     this.applierUserName = this.startUserName;
     this.initForm();
+    this.getUserList();
   },
   data() {
     return {
-      form: {
+      form: {        
+        userList: [],
         user: {
           nickName: ''
         },
@@ -526,6 +530,17 @@ export default {
         });
       }
     },
+    // 获取用户列表
+    getUserList() {
+      listUser({
+        pageNum: 1,
+        pageSize: 9999
+      }).then(res => {
+        if (res.code == 200) {
+          this.userList = res.rows
+        }
+      })
+    },
     handleConfirm(project) {
       this.selectedProject = project;
       this.projectObj = project;
@@ -594,9 +609,9 @@ export default {
         this.selectDevice = [];
       }
     },
-    submit() {
-      this.$refs.form.validate().then(() => {
-        this.$modal.confirm('是否提交设备申请？').then(() => {
+    async submit() {
+      this.$refs.form.validate().then(async () => {
+        this.$modal.confirm('是否提交设备申请？').then(async () => {
           let submitData = {
             ...this.form,
             ...(this.form.formId ? {} : { formId: this.taskForm.formId }),
@@ -604,34 +619,36 @@ export default {
           };
           let jsonForm = JSON.stringify(submitData);
           if (!this.form.deviceApplyId) {
-            submitDeviceApproval(jsonForm).then(res => {
+            submitDeviceApproval(jsonForm).then(async res => {
               // 获取下一个流程节点
-              this.getNextFlowNodeApproval().then(() => {
-                uni.showToast({
-                  title: '提交成功',
-                  icon: 'success'
-                });
-                setTimeout(() => {
-                  uni.switchTab({
-                    url: '/pages/message/index'
-                  })
-                }, 500);
-              })
+              await this.getNextFlowNodeApproval();
+              // 发送企业微信消息
+              await this.sendQyMessage();
+              uni.showToast({
+                title: '提交成功',
+                icon: 'success'
+              });
+              setTimeout(() => {
+                uni.switchTab({
+                  url: '/pages/message/index'
+                })
+              }, 500);
             });
           } else {
-            modifyDeviceApproval(jsonForm).then(res => {
+            modifyDeviceApproval(jsonForm).then(async res => {
               // 获取下一个流程节点
-              this.getNextFlowNodeApproval().then(() => {
-                uni.showToast({
-                  title: '提交成功',
-                  icon: 'success'
-                });
-                setTimeout(() => {
-                  uni.switchTab({
-                    url: '/pages/message/index'
-                  })
-                }, 500);
-              })
+              await this.getNextFlowNodeApproval();
+              // 发送企业微信消息
+              await this.sendQyMessage();
+              uni.showToast({
+                title: '提交成功',
+                icon: 'success'
+              });
+              setTimeout(() => {
+                uni.switchTab({
+                  url: '/pages/message/index'
+                })
+              }, 500);
             })
           }
         })
@@ -672,8 +689,8 @@ export default {
         });
       }
     },
-    completeApply() {
-      this.$refs.form.validate().then(() => {
+    async completeApply() {
+      this.$refs.form.validate().then(async () => {
         // 在归还确认节点时，检查所有设备是否都已归还
         if (this.taskName === '归还确认') {
           const allDevices = this.modifyDeviceList.map(item => item.deviceId);
@@ -692,7 +709,7 @@ export default {
         uni.showModal({
           title: '提示',
           content: '确定提交审批吗？',
-          success: (res) => {
+          success: async (res) => {
             if (res.confirm) {
               let submitData = {
                 ...this.form,
@@ -704,21 +721,19 @@ export default {
                 submitData.modifyDevices = this.modifyDeviceList.map(item => item.deviceId);
               }
               let jsonForm = JSON.stringify(submitData);
-              modifyDeviceApproval(jsonForm).then(res => {
+              modifyDeviceApproval(jsonForm).then(async res => {
                 // 获取下一个流程节点
-                getNextFlowNode({ taskId: this.taskForm.taskId }).then(res => {
-                  this.getNextFlowNodeApproval().then(() => {
-                    uni.showToast({
-                      title: '提交成功',
-                      icon: 'success'
-                    });
-                    setTimeout(() => {
-                      uni.switchTab({
-                        url: '/pages/message/index'
-                      });
-                    }, 500);
-                  });
+                await getNextFlowNode({ taskId: this.taskForm.taskId });
+                await this.getNextFlowNodeApproval();
+                uni.showToast({
+                  title: '提交成功',
+                  icon: 'success'
                 });
+                setTimeout(() => {
+                  uni.switchTab({
+                    url: '/pages/message/index'
+                  });
+                }, 500);
               });
             }
           }
@@ -789,7 +804,59 @@ export default {
       this.repairDevicesList = this.modifyDeviceList.filter(device =>
         this.form.repairDevices.includes(device.deviceId)
       );
-    }
+    },
+    // 发送企业微信消息
+    async sendQyMessage() {
+      try {
+        let userIds = [];
+        let userString = [];
+        let message = '';
+        let formData = new FormData();
+        
+        // 获取下一个审批人
+        if (this.taskName == '设备申请') {
+          let result = await getUserByRole({ roleId: 4 });
+          if (result.data && result.data.length > 0) {
+            userIds.push(result.data[0]);
+          }
+        } else if (this.taskName == '安排设备') {
+          let res = await getUsersManageLeader({ userId: this.form.applier });
+          if (res.data) {
+            res.data.forEach(user => {
+              userIds.push(user.userId);
+            });
+          }
+        }
+        
+        for (let u of userIds) {
+          let { data } = await getUser(u);
+          if (data) {
+            userString.push(data.pinyin);
+          }
+        }
+        
+        message = "您有一条新的设备申请:  \n>" + 
+        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
+        "开始日期：" + this.form.beginDate + " \n>" + 
+        "结束日期：" + this.form.endDate + " \n>" +  
+        "申请事由：" + this.form.applyReason + "  \n>";
+        
+        formData.append('message', message);
+        formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+        
+        if (userIds.length > 0) {
+          await sendQyMessage(formData);
+        }
+      } catch (error) {
+        console.error('发送企业微信消息失败:', error);
+      }
+    },
+    // 获取用户名称
+    getUserName(userId) {
+      if (!userId || !this.userList) return '';
+      let user = this.userList.find(u => u.userId == userId);
+      return user ? user.nickName : '';
+    },
   }
 }
 </script>

oa-ui-app/pages/work/index.vue

@@ -110,6 +110,7 @@ export default {
       queryProcessParams: {
         pageNum: 1,
         pageSize: 9999,
+        parentDeploymentId: null,
         name: null,
         category: null,
         key: null,
@@ -217,7 +218,10 @@ export default {
         let list = []
         for (let i of this.definitionList) {
           if (this.flowList.includes(i.name)) {
-            list.push(i)
+			if (i.name != "借款审批")
+				list.push(i);
+			if (i.name == "借款审批" && i.version == 2)
+				list.push(i);
           }
         }
         this.sendFlowList = list;

oa-ui-app/store/modules/user.js

@@ -75,8 +75,12 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/user.png") : baseUrl + user.avatar
+          const user = res.user		  
+          let avatar = require("@/static/images/user.png")
+          if (user.avatar == "" || user.avatar == null)
+			avatar = user.sex == '0' ? avatar : require("@/static/images/female.png")
+          else
+            avatar = baseUrl + user.avatar;
           const username = (user == null || user.nickName == "" || user.nickName == null) ? "" : user.nickName
           const userId = (user == null || user.userId == "" || user.userId == null) ? "" : user.userId
           if (res.roles && res.roles.length > 0) {

oa-ui/src/api/llm/rag.js

@@ -96,6 +96,9 @@ export function getAnswerStream(question, collectionName, onMessage, onError, on
                 if (jsonData.resultContent) {
                   console.log('=== 准备发送剩余resultContent ===', jsonData.resultContent)
                   onMessage(jsonData.resultContent)
+                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
+                  console.log('=== 准备发送剩余OpenAI格式内容 ===', jsonData.choices[0].delta.content)
+                  onMessage(jsonData.choices[0].delta.content)
                 } else if (typeof jsonData === 'string') {
                   console.log('=== 准备发送剩余字符串 ===', jsonData)
                   onMessage(jsonData)
@@ -154,19 +157,22 @@ export function getAnswerStream(question, collectionName, onMessage, onError, on
           }
 
           // 处理解析成功的数据
-          if (jsonData) {
-            console.log('=== 解析成功的数据 ===', jsonData)
-
-            if (jsonData.resultContent) {
-              console.log('=== 准备发送resultContent ===', jsonData.resultContent)
-              onMessage(jsonData.resultContent)
-            } else if (typeof jsonData === 'string') {
-              console.log('=== 准备发送字符串 ===', jsonData)
-              onMessage(jsonData)
-            } else {
-              console.log('=== 数据格式不匹配，跳过content字段 ===', jsonData)
-            }
-          }
+              if (jsonData) {
+                console.log('=== 解析成功的数据 ===', jsonData)
+
+                if (jsonData.resultContent) {
+                  console.log('=== 准备发送resultContent ===', jsonData.resultContent)
+                  onMessage(jsonData.resultContent)
+                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
+                  console.log('=== 准备发送OpenAI格式内容 ===', jsonData.choices[0].delta.content)
+                  onMessage(jsonData.choices[0].delta.content)
+                } else if (typeof jsonData === 'string') {
+                  console.log('=== 准备发送字符串 ===', jsonData)
+                  onMessage(jsonData)
+                } else {
+                  console.log('=== 数据格式不匹配，跳过content字段 ===', jsonData)
+                }
+              }
         })
 
         return readStream()

oa-ui/src/api/llm/session.js

@@ -5,6 +5,7 @@
  * @LastEditTime: 2025-07-22 15:42:04
  */
 import request from '@/utils/request'
+import { getToken } from '@/utils/auth'
 
 // 查询cmc聊天记录详细
 export function getAnswer(question) {
@@ -22,4 +23,260 @@ export function getAnswerWithDocument(question) {
     method: 'get',
     params: question
   })
+}
+
+// 流式回答API - 使用fetch API处理流式响应
+export function getAnswerStream(params, onMessage, onError, onComplete) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const url = `${baseURL}/llm/session/answer?topicId=${params.topicId}&question=${encodeURIComponent(params.question)}`
+
+  const controller = new AbortController()
+
+  fetch(url, {
+    method: 'GET',
+    headers: {
+      'Authorization': 'Bearer ' + getToken(),
+      'Accept': 'application/json, text/event-stream',
+      'Cache-Control': 'no-cache'
+    },
+    signal: controller.signal
+  }).then(response => {
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`)
+    }
+
+    const reader = response.body.getReader()
+    const decoder = new TextDecoder()
+    let buffer = ''
+
+    function readStream() {
+      return reader.read().then(({ done, value }) => {
+        if (done) {
+          if (buffer.trim()) {
+            const lines = buffer.split(/\r?\n/)
+            lines.forEach(line => {
+              line = line.trim()
+              if (!line || line.startsWith(':')) return
+
+              let jsonData = null
+              if (line.startsWith('data: ')) {
+                try {
+                  jsonData = JSON.parse(line.slice(6))
+                } catch (error) {
+                  console.error('解析剩余SSE数据失败:', error, line)
+                }
+              } else if (line.startsWith('data:')) {
+                try {
+                  jsonData = JSON.parse(line.slice(5))
+                } catch (error) {
+                  console.error('解析剩余SSE数据失败(无空格):', error, line)
+                }
+              } else {
+                try {
+                  jsonData = JSON.parse(line)
+                } catch (error) {
+                  console.error('解析剩余JSON数据失败:', error, line)
+                }
+              }
+
+              if (jsonData) {
+                if (jsonData.resultContent) {
+                  onMessage(jsonData.resultContent)
+                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
+                  onMessage(jsonData.choices[0].delta.content)
+                } else if (typeof jsonData === 'string') {
+                  onMessage(jsonData)
+                }
+              }
+            })
+          }
+
+          onComplete()
+          return
+        }
+
+        const chunk = decoder.decode(value, { stream: true })
+        buffer += chunk
+
+        const lines = buffer.split(/\r?\n/)
+        buffer = lines.pop() || ''
+
+        lines.forEach(line => {
+          line = line.trim()
+          if (!line || line.startsWith(':')) return
+
+          let jsonData = null
+          if (line.startsWith('data: ')) {
+            try {
+              jsonData = JSON.parse(line.slice(6))
+            } catch (error) {
+              console.error('解析SSE数据失败:', error, line)
+            }
+          } else if (line.startsWith('data:')) {
+            try {
+              jsonData = JSON.parse(line.slice(5))
+            } catch (error) {
+              console.error('解析SSE数据失败(无空格):', error, line)
+            }
+          } else {
+            try {
+              jsonData = JSON.parse(line)
+            } catch (error) {
+              console.error('解析JSON数据失败:', error, line)
+            }
+          }
+
+          if (jsonData) {
+            if (jsonData.resultContent) {
+              onMessage(jsonData.resultContent)
+            } else if (typeof jsonData === 'string') {
+              onMessage(jsonData)
+            }
+          }
+        })
+
+        return readStream()
+      })
+    }
+
+    return readStream()
+  })
+    .catch(error => {
+      if (error.name === 'AbortError') {
+        console.log('请求被取消')
+        return
+      }
+      console.error('流式请求错误:', error)
+      onError(new Error('网络连接失败，请检查网络连接后重试'))
+    })
+
+  return controller
+}
+
+// 流式回答API（带文档）- 使用fetch API处理流式响应
+export function getAnswerWithDocumentStream(params, onMessage, onError, onComplete) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const url = `${baseURL}/llm/session/answerWithDocument?topicId=${params.topicId}&chatId=${params.chatId}&question=${encodeURIComponent(params.question)}`
+
+  const controller = new AbortController()
+
+  fetch(url, {
+    method: 'GET',
+    headers: {
+      'Authorization': 'Bearer ' + getToken(),
+      'Accept': 'application/json, text/event-stream',
+      'Cache-Control': 'no-cache'
+    },
+    signal: controller.signal
+  }).then(response => {
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`)
+    }
+
+    const reader = response.body.getReader()
+    const decoder = new TextDecoder()
+    let buffer = ''
+
+    function readStream() {
+      return reader.read().then(({ done, value }) => {
+        if (done) {
+          if (buffer.trim()) {
+            const lines = buffer.split(/\r?\n/)
+            lines.forEach(line => {
+              line = line.trim()
+              if (!line || line.startsWith(':')) return
+
+              let jsonData = null
+              if (line.startsWith('data: ')) {
+                try {
+                  jsonData = JSON.parse(line.slice(6))
+                } catch (error) {
+                  console.error('解析剩余SSE数据失败:', error, line)
+                }
+              } else if (line.startsWith('data:')) {
+                try {
+                  jsonData = JSON.parse(line.slice(5))
+                } catch (error) {
+                  console.error('解析剩余SSE数据失败(无空格):', error, line)
+                }
+              } else {
+                try {
+                  jsonData = JSON.parse(line)
+                } catch (error) {
+                  console.error('解析剩余JSON数据失败:', error, line)
+                }
+              }
+
+              if (jsonData) {
+                if (jsonData.resultContent) {
+                  onMessage(jsonData.resultContent)
+                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
+                  onMessage(jsonData.choices[0].delta.content)
+                } else if (typeof jsonData === 'string') {
+                  onMessage(jsonData)
+                }
+              }
+            })
+          }
+
+          onComplete()
+          return
+        }
+
+        const chunk = decoder.decode(value, { stream: true })
+        buffer += chunk
+
+        const lines = buffer.split(/\r?\n/)
+        buffer = lines.pop() || ''
+
+        lines.forEach(line => {
+          line = line.trim()
+          if (!line || line.startsWith(':')) return
+
+          let jsonData = null
+          if (line.startsWith('data: ')) {
+            try {
+              jsonData = JSON.parse(line.slice(6))
+            } catch (error) {
+              console.error('解析SSE数据失败:', error, line)
+            }
+          } else if (line.startsWith('data:')) {
+            try {
+              jsonData = JSON.parse(line.slice(5))
+            } catch (error) {
+              console.error('解析SSE数据失败(无空格):', error, line)
+            }
+          } else {
+            try {
+              jsonData = JSON.parse(line)
+            } catch (error) {
+              console.error('解析JSON数据失败:', error, line)
+            }
+          }
+
+          if (jsonData) {
+            if (jsonData.resultContent) {
+              onMessage(jsonData.resultContent)
+            } else if (typeof jsonData === 'string') {
+              onMessage(jsonData)
+            }
+          }
+        })
+
+        return readStream()
+      })
+    }
+
+    return readStream()
+  })
+    .catch(error => {
+      if (error.name === 'AbortError') {
+        console.log('请求被取消')
+        return
+      }
+      console.error('流式请求错误:', error)
+      onError(new Error('网络连接失败，请检查网络连接后重试'))
+    })
+
+  return controller
 }

oa-ui/src/views/flowable/form/changeForm.vue

@@ -69,6 +69,8 @@ import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import { sendQyMessage } from "@/api/qywx/index";
+import { getUser } from '@/api/system/user';
 import { getDept } from "@/api/system/dept";
 
 export default {
@@ -258,6 +260,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '变更登记') {
+                sendQyMessage(this.leaderList);
                 this.$set(this.taskForm.variables, "approvalList", this.leaderList);
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
@@ -281,6 +284,7 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
+              sendQyMessage(this.leaderList);
               this.$set(this.taskForm.variables, "approvalList", this.leaderList);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
@@ -291,6 +295,26 @@ export default {
         }
       });
     },
+    // 发送企业微信消息
+    async sendQyMessage(userIds) {
+      if (userIds && userIds.length > 0) {
+        let formData = new FormData();
+        let message = "经营发展部发起项目变更通知:  \n>" + 
+        "登记人：<font color='info'>" + this.getUserName(this.form.registrant) + "</font> \n>" + 
+        "变更项目：" + this.chooseProject.projectNumber + "-" + this.chooseProject.projectName + " \n>" + 
+        "变更内容：" + this.form.content + " \n>";
+        formData.append('message', message);
+        let userString = [];
+        for (let u of userIds) {
+          let { data } = await getUser(u);
+          if (data && data.pinyin) {
+            userString.push(data.pinyin);
+          }
+        }
+        formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+        await sendQyMessage(formData);
+      }
+    },
   }
 };
 </script>

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -370,6 +370,8 @@ import ReturnComment from '@/views/flowable/form/components/flowBtn/returnCommen
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 import newBudgetInfo from '@/views/flowable/form/budget/adjust/newBudgetInfo.vue';
 import HistoryBorrow from './historyBorrow.vue';
+import { sendQyMessage } from "@/api/qywx/index"
+import { getUser } from "@/api/system/user"
 
 export default {
   dicts: ['cmc_borrow_expense', 'cmc_unit'],
@@ -557,6 +559,9 @@ export default {
         this.rules = {
           zjlComment: [
             { required: true, message: '请输入总经理审批意见', trigger: 'blur' }
+          ],
+          managerAmount: [
+            { required: true, message: '请输入核准金额', trigger: 'blur' }
           ]
         }
       } else if (this.taskName == '董事长审核') {
@@ -740,13 +745,17 @@ export default {
       this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
         type: 'warning'
-      }).then(() => {
-        this.$refs["form"].validate(valid => {
+      }).then(async () => {
+        this.$refs["form"].validate(async (valid) => {
           if (valid) {
             if (this.form.borrowUsage == '0' && !this.form.projectId) {
               this.$message.error('请选择项目！')
               return
             }
+            let formData = new FormData();
+            let message = ''
+            let userIds = [];
+            let userString = []
             if (this.formTotal != 0) {
               // 更新借款明细项
               delBorrowDetail(this.taskForm.formId).then(res => {
@@ -782,68 +791,79 @@ export default {
               // 更新借款审批表
               updateBorrow(this.form);
               const params = { taskId: this.taskForm.taskId };
-              getNextFlowNode(params).then(res => {
-                if (this.taskName == '借款申请') {
-                  this.borrowAprrovalFun();
-                } else if (this.taskName == '部门审核') {
-                  this.$set(this.taskForm.variables, "need", this.need);
-                  if (this.need) {
-                    getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
-                      let userIds = [];
-                      if (res.data) {
-                        res.data.forEach(item => {
-                          userIds.push(item.userId)
-                        })
-                      }
-                      this.$set(this.taskForm.variables, "approvalList", userIds);
-                      this.handleComplete(this.taskForm);
-                    })
-                  }
-                  else {
-                    getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
-                      let userIds = [];
-                      if (res.data) {
-                        res.data.forEach(item => {
-                          userIds.push(item.userId)
-                        })
-                      }
-                      this.$set(this.taskForm.variables, "approvalList", userIds);
-                      getUserByPost({ postName: '总经理' }).then(res => {
-                        this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-                        this.handleComplete(this.taskForm);
-                      })
+              const res = await getNextFlowNode(params);
+              if (this.taskName == '借款申请') {
+                let userId = await this.borrowAprrovalFun()
+                userIds.push(userId);
+              }
+              else if (this.taskName == '部门审核') {
+                this.$set(this.taskForm.variables, "need", this.need);
+                if (this.need) {
+                  const res1 = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+                  if (res1.data) {
+                    res1.data.forEach(item => {
+                      userIds.push(item.userId)
                     })
                   }
+                  this.$set(this.taskForm.variables, "approvalList", userIds);
+                  this.handleComplete(this.taskForm);
                 }
-                else if (this.taskName == '分管审核') {
-                  getUserByPost({ postName: '总经理' }).then(res => {
-                    this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-                    this.handleComplete(this.taskForm);
-                  })
-                }
-                else if (this.taskName == '总经理审核') {
-                  // this.exceed = false; //待删
-                  this.$set(this.taskForm.variables, "exceed", this.exceed);
-                  if (!this.exceed) { //没有超预算
-                    this.submitFD(); //提交到财务部审核
-                  }
-                  else {
-                    getUserByPost({ postName: '董事长' }).then(res => {
-                      this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-                      this.handleComplete(this.taskForm);
+                else {
+                  const res1 = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+                  if (res1.data) {
+                    res1.data.forEach(item => {
+                      userIds.push(item.userId)
                     })
                   }
+                  this.$set(this.taskForm.variables, "approvalList", userIds);
+                  const res2 = await getUserByPost({ postName: '总经理' });
+                  userIds = []
+                  userIds.push(res2.data[0].userId)
+                  this.$set(this.taskForm.variables, "approval", res2.data[0].userId);
+                  this.handleComplete(this.taskForm);
                 }
-                else if (this.taskName == '董事长批准') {
-                  this.submitFD(); //提交到财务部审核
-                }
-                else if (this.taskName == '党工团审核') {
-                  this.submitFD(); //提交到财务部审核
+              }
+              else if (this.taskName == '分管审核') {
+                const res1 = await getUserByPost({ postName: '总经理' });
+                userIds.push(res1.data[0].userId)
+                this.$set(this.taskForm.variables, "approval", res1.data[0].userId);
+                this.handleComplete(this.taskForm);
+              }
+              else if (this.taskName == '总经理审核') {
+                this.$set(this.taskForm.variables, "exceed", this.exceed);
+                if (!this.exceed) {
+                  userIds = this.submitFD();
                 }
-                else if (this.taskName == '财务处理') {
+                else {
+                  const res1 = await getUserByPost({ postName: '董事长' });
+                  userIds.push(res1.data[0].userId)
+                  this.$set(this.taskForm.variables, "approval", res1.data[0].userId);
                   this.handleComplete(this.taskForm);
                 }
-              })
+              }
+              else if (this.taskName == '董事长批准') {
+                userIds = this.submitFD();
+              }
+              else if (this.taskName == '党工团审核') {
+                userIds = this.submitFD();
+              }
+              else if (this.taskName == '财务处理') {
+                this.handleComplete(this.taskForm);
+              }
+              for (let u of userIds) {
+                let { data } = await getUser(u)
+                userString.push(data.pinyin)
+              }
+              message = "您有一条新的借款申请:  \n>" + 
+              "申请人：<font color='info'>" + this.form.applierUser.nickName + "</font>  \n>" + 
+              "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
+              "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
+              formData.append('message', message)
+              formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+              
+              if (userIds.length > 0)
+                sendQyMessage(formData);
+
             } else {
               delBorrowDetail(this.taskForm.formId).then(() => {
                 for (let detail of this.detailList) {
@@ -857,9 +877,22 @@ export default {
               });
               const params = { taskId: this.taskForm.taskId };
               // 提交到下一个流程
-              getNextFlowNode(params).then(res => {
-                this.borrowAprrovalFun();
-              })
+              const res = await getNextFlowNode(params);
+              let userId = await this.borrowAprrovalFun()
+              userIds.push(userId);
+              for (let u of userIds) {
+                let { data } = await getUser(u)
+                userString.push(data.pinyin)
+              }
+              message = "您有一条新的借款申请:  \n>" + 
+              "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
+              "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
+              "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
+              formData.append('message', message)
+              formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+              
+              if (userIds.length > 0)
+                sendQyMessage(formData);
             }
           } else {
             this.$message.error('请完善必填项')
@@ -875,7 +908,7 @@ export default {
     },
     // 借款申请提交方法
     async borrowAprrovalFun() {
-      let userId;
+      let userId = 0;
       // 如果是党工团申请 deptId == 0 为党工团申请
       if (this.deptId == 0) {
         // 2为工会、3为党委
@@ -891,40 +924,39 @@ export default {
         this.handleComplete(this.taskForm);
       } else if (this.deptId == 102) { //如果是经营管理层申请，走总经理审批
         this.form.managerAmount = this.form.applyAmount;
-        updateBorrow(this.form);
-        getUserByPost({ postName: '总经理' }).then(res => {
-          this.$set(this.taskForm.variables, "dept", this.deptId);
-          this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-          this.handleComplete(this.taskForm);
-        })
+        await updateBorrow(this.form);
+        const res = await getUserByPost({ postName: '总经理' });
+        userId = res.data[0].userId;
+        this.$set(this.taskForm.variables, "dept", this.deptId);
+        this.$set(this.taskForm.variables, "approval", userId);
+        this.handleComplete(this.taskForm);
       } else if (this.deptId == 101) {//如果是董事会申请，走董事长批准
-        getUserByPost({ postName: '董事长' }).then(res => {
-          this.$set(this.taskForm.variables, "dept", this.deptId);
-          this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-          this.$set(this.taskForm.variables, "exceed", true);
-          this.handleComplete(this.taskForm);
-        })
+        const res = await getUserByPost({ postName: '董事长' });
+        userId = res.data[0].userId;
+        this.$set(this.taskForm.variables, "dept", this.deptId);
+        this.$set(this.taskForm.variables, "approval", userId);
+        this.$set(this.taskForm.variables, "exceed", true);
+        this.handleComplete(this.taskForm);
       }
       else { //普通员工申请项目借款
-        getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
-          this.$set(this.taskForm.variables, "dept", this.deptId);
-          this.handleComplete(this.taskForm);
-        })
+        const res = await getUsersDeptLeader({ userId: this.$store.getters.userId });
+        userId = res.data.userId;
+        this.$set(this.taskForm.variables, "approval", userId);
+        this.$set(this.taskForm.variables, "dept", this.deptId);
+        this.handleComplete(this.taskForm);
       }
+      return userId
     },
     // 提交给财务部审核
-    submitFD() {
+    async submitFD() {
       let approvalList = [];
-      getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
-        approvalList.push(res.data.userId);
-        getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
-          approvalList.push(res1.data.userId);
-          this.$set(this.taskForm.variables, "approvalList", approvalList);
-          this.handleComplete(this.taskForm);
-        })
-      });
+      const res = await getUsersDeptLeaderByDept({ deptId: 106 });
+      approvalList.push(res.data.userId);
+      const res1 = await getUsersViceDeptLeaderByDept({ deptId: 106 });
+      approvalList.push(res1.data.userId);
+      this.$set(this.taskForm.variables, "approvalList", approvalList);
+      this.handleComplete(this.taskForm);
+      return approvalList
     },
     showFormItem(name) {
       let isShow = false;

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2025-06-23 09:35:51
+ * @LastEditTime: 2026-03-03 17:28:05
 -->
 
 <template>
@@ -290,6 +290,7 @@ import { listUser, getUser } from '@/api/system/user';
 import { getUserByRole } from "@/api/system/role";
 import chooseUser from "@/views/flowable/form/budget/components/choosePeople.vue";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import { sendQyMessage } from "@/api/qywx/index";
 import { number } from 'echarts';
 export default {
   components: {
@@ -588,63 +589,70 @@ export default {
         //   this.dept = 102
         this.$set(this.taskForm.variables, "dept", this.dept);
         if (this.dept == 101) {
-          getUserByPost({ postName: '董事长' }).then(result => {
+          getUserByPost({ postName: '董事长' }).then(async result => {
             this.$set(this.taskForm.variables, "approval", result.data[0].userId);
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);
               this.$emit('goBack')
-            })
+            });
+            await this.sendQyMessage([result.data[0].userId]);
           })
         }
         else if (this.dept == 102) {
-          getUserByPost({ postName: '总经理' }).then(result => {
+          getUserByPost({ postName: '总经理' }).then(async result => {
             this.$set(this.taskForm.variables, "approval", result.data[0].userId);
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);
               this.$emit('goBack')
-            })
+            });
+            await this.sendQyMessage([result.data[0].userId]);
           })
         }
         else if (this.dept == 0) {
           let postName = this.getChooseType()
-          getUserByPost({ postName: postName }).then(result => {
+          getUserByPost({ postName: postName }).then(async result => {
             this.$set(this.taskForm.variables, "approval", result.data[0].userId);
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);
               this.$emit('goBack')
-            })
+            });
+            await this.sendQyMessage([result.data[0].userId]);
           })
         }
         else {
-          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(async res => {
             if (res.data) {
               this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
-              })
+              });
+              await this.sendQyMessage([res.data.userId]);
             }
           })
         }
       } else if (this.taskName == '部门审核') {
-        getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = [];
+        getUsersManageLeader({ userId: this.$store.getters.userId }).then(async res => {
+          let userIds = [];
           res.data.forEach(user => {
-            userId.push(user.userId)
-          })
-          this.$set(this.taskForm.variables, "approvalList", userId);
+            userIds.push(user.userId)
+          });
+          this.$set(this.taskForm.variables, "approvalList", userIds);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
           });
+          await this.sendQyMessage(userIds);
         })
       } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核' || this.taskName == '董事长审核') {
-        getUserByRole({ roleId: 5 }).then(result => {
+        getUserByRole({ roleId: 5 }).then(async result => {
+          let userIds = result.data.map(item => item.userId);
           this.$set(this.taskForm.variables, "approvalList", result.data);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
-          })
+          });
+          await this.sendQyMessage(userIds);
         });
       } else if (this.taskName == '安排用车') {
         this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(() => {
@@ -789,6 +797,28 @@ export default {
         isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.dszUserId != null);
       return isShow;
     },
+    // 发送企业微信消息
+    async sendQyMessage(userIds) {
+      if (userIds && userIds.length > 0) {
+        let formData = new FormData();
+        let message = "您有一条新的用车申请:  \n>" + 
+        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
+        "用车事由：" + this.form.applyReason + " \n>" + 
+        "开始日期：" + this.form.beginDate + " \n>" + 
+        "结束日期：" + this.form.endDate + " \n>" + 
+        "乘车人数：" + this.form.passengers + "人  \n>";
+        formData.append('message', message);
+        let userString = [];
+        for (let u of userIds) {
+          let { data } = await getUser(u);
+          if (data && data.pinyin) {
+            userString.push(data.pinyin);
+          }
+        }
+        formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+        await sendQyMessage(formData);
+      }
+    },
   },
 }
 </script>

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-27 11:15:28
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-03-10 15:04:05
 -->
 
 <template>
@@ -220,6 +220,8 @@ import { getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
+import { sendQyMessage } from "@/api/qywx/index";
+import { getUser } from "@/api/system/user";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 import ChooseDevice from '../budget/components/chooseDevice.vue';
 export default {
@@ -434,8 +436,8 @@ export default {
         }
       })
     },
-    submit() {
-      this.$refs['deviceForm'].validate((valid) => {
+    async submit() {
+      this.$refs['deviceForm'].validate(async (valid) => {
         if (valid) {
           let y1 = new Date(this.form.beginDate);
           let y2 = new Date(this.form.endDate);
@@ -453,9 +455,33 @@ export default {
             submitDeviceApproval(jsonForm);
           }
           // 获取下一个流程节点
-          getNextFlowNode(params).then(res => {
+          getNextFlowNode(params).then(async res => {
             const data = res.data;
-            this.getNextFlowNodeApproval();
+            let userIds = await this.getNextFlowNodeApproval();
+            // 发送企业微信消息
+            let userString = [];
+            let message = '';
+            let formData = new FormData();
+
+            for (let u of userIds) {
+              let { data } = await getUser(u);
+              if (data) {
+                userString.push(data.pinyin);
+              }
+            }
+            
+            message = "您有一条新的设备申请:  \n>" + 
+            "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
+            "开始日期：" + this.form.beginDate + " \n>" + 
+            "结束日期：" + this.form.endDate + " \n>" +  
+            "申请事由：" + this.form.applyReason + "  \n>";
+            
+            formData.append('message', message);
+            formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+            
+            if (userIds.length > 0) {
+              sendQyMessage(formData);
+            }
           })
         } else {
           this.$message.error('必填项未填写完毕')
@@ -478,8 +504,8 @@ export default {
         }
       })
     },
-    completeApply() {
-      this.$refs['deviceForm'].validate((valid) => {
+    async completeApply() {
+      this.$refs['deviceForm'].validate(async (valid) => {
         if (valid) {
           this.form.formId = this.taskForm.formId;
           this.form.deviceApplyId = this.taskForm.formId;
@@ -487,9 +513,33 @@ export default {
           modifyDeviceApproval(jsonForm);
           const params = { taskId: this.taskForm.taskId };
           // 获取下一个流程节点
-          getNextFlowNode(params).then(res => {
+          getNextFlowNode(params).then(async res => {
             const data = res.data;
-            this.getNextFlowNodeApproval();
+            let userIds = await this.getNextFlowNodeApproval();
+            // 发送企业微信消息
+            let userString = [];
+            let message = '';
+            let formData = new FormData();
+            
+            for (let u of userIds) {
+              let { data } = await getUser(u);
+              if (data) {
+                userString.push(data.pinyin);
+              }
+            }
+            
+            message = "您有一条新的设备申请:  \n>" + 
+            "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
+            "开始日期：" + this.form.beginDate + " \n>" + 
+            "结束日期：" + this.form.endDate + " \n>" +  
+            "申请事由：" + this.form.applyReason + "  \n>";
+            
+            formData.append('message', message);
+            formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
+            
+            if (userIds.length > 0) {
+              sendQyMessage(formData);
+            }
           })
         } else {
           this.$message.error('必填项未填写完毕')
@@ -497,34 +547,32 @@ export default {
       })
     },
     // 获取下一个审批人
-    getNextFlowNodeApproval() {
+    async getNextFlowNodeApproval() {
+      let userIds = [];
       if (this.taskName == '设备申请') {
-        getUserByRole({ roleId: 4 }).then(result => {
-          this.$set(this.taskForm.variables, "approval", result.data[0]);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
+        const result = await getUserByRole({ roleId: 4 });
+        userIds.push(result.data[0]);
+        this.$set(this.taskForm.variables, "approval", result.data[0]);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
         });
       } else if (this.taskName == '安排设备') {
-        getUsersManageLeader({ userId: this.form.applier }).then(res => {
-          let userId = [];
-          res.data.forEach(user => {
-            userId.push(user.userId)
-          })
-          this.$set(this.taskForm.variables, "approvalList", userId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
+        const res = await getUsersManageLeader({ userId: this.form.applier });        
+        res.data.forEach(user => {
+          userIds.push(user.userId)
         })
+        this.$set(this.taskForm.variables, "approvalList", userIds);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
       } else if (this.taskName == '分管审核') {
-        getUserByRole({ roleId: 4 }).then(result => {
-          this.$set(this.taskForm.variables, "approval", result.data[0]);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
+        const result = await getUserByRole({ roleId: 4 });
+        this.$set(this.taskForm.variables, "approval", result.data[0]);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
         });
       } else if (this.taskName == '归还确认') {
         this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(() => {
@@ -534,6 +582,7 @@ export default {
           });
         })
       }
+      return userIds;
     },
     // 查询项目列表
     getProjectList() {

oa-ui/src/views/llm/chat/index.vue

@@ -292,7 +292,7 @@ import { Message as ElMessage, MessageBox as ElMessageBox } from 'element-ui'
 import { listTopic, getTopic, delTopic, addTopic, updateTopic } from "@/api/llm/topic";
 import { listChat, addChat, updateChat } from "@/api/llm/chat";
 import { listDocument, uploadDocument } from "@/api/llm/document";
-import { getAnswer, getAnswerWithDocument } from "@/api/llm/session";
+import { getAnswer, getAnswerWithDocument, getAnswerStream, getAnswerWithDocumentStream } from "@/api/llm/session";
 import logoImg from '@/assets/images/logo.png'
 import { marked } from 'marked';
 
@@ -516,34 +516,26 @@ export default {
         userId: this.$store.state.user.id,
         input: this.inputMessage,
         topicId: this.currentTopicId,
-        inputTime: parseTime(new Date(), '{y}-{m}-{d}'),
+        inputTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
         chatId: this.documentChatId || null
       };
 
-      // 添加用户消息到聊天记录
       this.chatMessages.push(userMessage);
+      const userMessageIndex = this.chatMessages.length - 1;
       const messageToSend = this.inputMessage;
       this.inputMessage = '';
 
-      // 暂存文件上传ID，用于后续查询
       const uploadedFileId = this.documentChatId;
-
-      // 清空文档chartId，确保每次上传只对下一条消息有效
       this.documentChatId = '';
-
-      // 清空已上传的文件列表
       this.selectedFiles = [];
 
       await this.$nextTick();
       this.scrollToBottom();
 
-      // 自动更改当前topic名称为用户问题
       try {
-        // 只有当当前topic名称为"新对话"时才更新为用户问题
         const currentTopic = this.topicList.find(item => item.topicId === this.currentTopicId);
         if (currentTopic && currentTopic.topic === '新对话') {
           await updateTopic({ topicId: this.currentTopicId, topic: messageToSend });
-          // 同步本地topicList
           const updateLocalTopic = (list) => {
             for (const item of list) {
               if (item.topicId === this.currentTopicId) {
@@ -557,64 +549,236 @@ export default {
         }
       } catch (e) { }
 
-      // 发送消息到后端，得到回答，并更新到数据库
-      try {
-        this.isLoading = true;
+      const aiMessage = {
+        userId: this.$store.state.user.id,
+        input: '',
+        output: '',
+        topicId: this.currentTopicId,
+        outputTime: parseTime(new Date(), '{y}-{m}-{d}')
+      };
+      this.chatMessages.push(aiMessage);
 
-        let answer;
-        // 判断是否存在附件，存在则使用getAnswerWithDocument API
-        if (uploadedFileId) {
-          answer = await getAnswerWithDocument({ topicId: this.currentTopicId, chatId: uploadedFileId, question: userMessage.input });
-        } else {
-          answer = await getAnswer({ topicId: this.currentTopicId, question: userMessage.input });
-        }
+      const messageIndex = this.chatMessages.length - 1;
 
-        // 使用Vue的响应式更新方法
-        const messageIndex = this.chatMessages.length - 1;
-        if (messageIndex >= 0) {
-          // 使用Vue.set或直接赋值来确保响应式更新
-          this.$set(this.chatMessages, messageIndex, {
-            ...this.chatMessages[messageIndex],
-            output: answer[0].content,
-            outputTime: parseTime(new Date(), '{y}-{m}-{d}')
-          });
-        }
+      this.isLoading = true;
 
-        // 保存到数据库
-        const savedMessage = await addChat(this.chatMessages[messageIndex]);
+      const streamParams = {
+        topicId: this.currentTopicId,
+        question: userMessage.input
+      };
 
-        // 如果保存成功，更新消息的实际ID
-        if (savedMessage && savedMessage.chatId) {
-          this.$set(this.chatMessages[messageIndex], 'chatId', savedMessage.chatId);
-        }
+      let streamController;
+      if (uploadedFileId) {
+        streamParams.chatId = uploadedFileId;
+        streamController = getAnswerWithDocumentStream(
+          streamParams,
+          (content) => {
+            const that = this;
+            let cleanContent = content.replace(/<\/?think>/g, '');
+            if (!cleanContent.trim()) {
+              return;
+            }
+            aiMessage.output += cleanContent;
+            aiMessage.outputTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
 
-        // 如果当前消息包含文件，使用上传时的ID查询文件列表
-        if (uploadedFileId) {
-          try {
-            const fileResponse = await listDocument({ chatId: uploadedFileId });
-            if (fileResponse.rows && fileResponse.rows.length > 0) {
-              // 使用消息的chatId作为key存储文件列表
-              const messageChatId = this.chatMessages[messageIndex].chatId;
-              const keyToUse = messageChatId || uploadedFileId;
-              this.messageFileMap.set(keyToUse, fileResponse.rows);
-
-              // 确保消息有chatId用于显示
-              if (!this.chatMessages[messageIndex].chatId) {
-                this.$set(this.chatMessages[messageIndex], 'chatId', uploadedFileId);
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+            }
+            window.responseTimeout = setTimeout(() => {
+              if (that.isLoading) {
+                console.log('=== 响应超时强制结束 ===');
+                that.isLoading = false;
+                if (window.responseTimeout) {
+                  clearTimeout(window.responseTimeout);
+                  window.responseTimeout = null;
+                }
               }
+            }, 300000);
+
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
+          },
+          (error) => {
+            const that = this;
+            console.error('=== 流式回答错误 ===', error);
+
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+              window.responseTimeout = null;
             }
-          } catch (error) {
-            console.error('Failed to load files for new message:', error);
+
+            if (aiMessage.output === '') {
+              aiMessage.output = '抱歉，我暂时无法回答您的问题，请稍后再试。';
+            } else {
+              aiMessage.output += '\n\n[回答生成中断]';
+            }
+            that.isLoading = false;
+
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
+          },
+          async () => {
+            const that = this;
+            console.log('=== 回答完成 ===');
+
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+              window.responseTimeout = null;
+            }
+
+            try {
+              // 保存用户消息
+              const savedUserMessage = await addChat({
+                ...that.chatMessages[userMessageIndex],
+                topicId: that.currentTopicId
+              });
+
+              // 保存AI消息
+              const savedMessage = await addChat({
+                ...aiMessage,
+                topicId: that.currentTopicId
+              });
+
+              if (savedUserMessage && savedUserMessage.chatId) {
+                that.$set(that.chatMessages, userMessageIndex, {
+                  ...that.chatMessages[userMessageIndex],
+                  chatId: savedUserMessage.chatId
+                });
+              }
+
+              if (savedMessage && savedMessage.chatId) {
+                that.$set(that.chatMessages, messageIndex, {
+                  ...that.chatMessages[messageIndex],
+                  chatId: savedMessage.chatId
+                });
+              }
+
+              if (uploadedFileId) {
+                try {
+                  const fileResponse = await listDocument({ chatId: uploadedFileId });
+                  if (fileResponse.rows && fileResponse.rows.length > 0) {
+                    const messageChatId = that.chatMessages[messageIndex].chatId;
+                    const keyToUse = messageChatId || uploadedFileId;
+                    that.messageFileMap.set(keyToUse, fileResponse.rows);
+
+                    if (!that.chatMessages[messageIndex].chatId) {
+                      that.$set(that.chatMessages[messageIndex], 'chatId', uploadedFileId);
+                    }
+                  }
+                } catch (error) {
+                  console.error('Failed to load files for new message:', error);
+                }
+              }
+            } catch (error) {
+              console.error('保存消息失败:', error);
+            }
+
+            that.isLoading = false;
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
           }
-        }
+        );
+      } else {
+        streamController = getAnswerStream(
+          streamParams,
+          (content) => {
+            const that = this;
+            let cleanContent = content.replace(/<\/?think>/g, '');
+            if (!cleanContent.trim()) {
+              return;
+            }
+            aiMessage.output += cleanContent;
+            aiMessage.outputTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
 
-        this.isLoading = false;
-        await this.$nextTick();
-        this.scrollToBottom();
-      } catch (error) {
-        ElMessage.error('发送消息失败');
-        this.isLoading = false;
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+            }
+            window.responseTimeout = setTimeout(() => {
+              if (that.isLoading) {
+                console.log('=== 响应超时强制结束 ===');
+                that.isLoading = false;
+                if (window.responseTimeout) {
+                  clearTimeout(window.responseTimeout);
+                  window.responseTimeout = null;
+                }
+              }
+            }, 300000);
+
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
+          },
+          (error) => {
+            const that = this;
+            console.error('=== 流式回答错误 ===', error);
+
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+              window.responseTimeout = null;
+            }
+
+            if (aiMessage.output === '') {
+              aiMessage.output = '抱歉，我暂时无法回答您的问题，请稍后再试。';
+            } else {
+              aiMessage.output += '\n\n[回答生成中断]';
+            }
+            that.isLoading = false;
+
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
+          },
+          async () => {
+            const that = this;
+            console.log('=== 回答完成 ===');
+
+            if (window.responseTimeout) {
+              clearTimeout(window.responseTimeout);
+              window.responseTimeout = null;
+            }
+
+            try {
+              // 保存用户消息
+              const savedUserMessage = await addChat({
+                ...that.chatMessages[userMessageIndex],
+                topicId: that.currentTopicId
+              });
+
+              // 保存AI消息
+              const savedMessage = await addChat({
+                ...aiMessage,
+                topicId: that.currentTopicId
+              });
+
+              if (savedUserMessage && savedUserMessage.chatId) {
+                that.$set(that.chatMessages, userMessageIndex, {
+                  ...that.chatMessages[userMessageIndex],
+                  chatId: savedUserMessage.chatId
+                });
+              }
+
+              if (savedMessage && savedMessage.chatId) {
+                that.$set(that.chatMessages, messageIndex, {
+                  ...that.chatMessages[messageIndex],
+                  chatId: savedMessage.chatId
+                });
+              }
+            } catch (error) {
+              console.error('保存消息失败:', error);
+            }
+
+            that.isLoading = false;
+            that.$nextTick(() => {
+              that.scrollToBottom();
+            });
+          }
+        );
       }
+
+      window.currentChatController = streamController;
     },
 
     handleKeyDown(event) {
@@ -704,60 +868,69 @@ export default {
           this.topicList = response.rows;
           this.total = response.total;
           this.hasRecords = true;
-          // 分类近期记录
+        } else {
+          // 没有记录时，清空列表
+          this.topicList = [];
+          this.total = 0;
+          this.hasRecords = false;
+          // 清空当前选中的话题
+          this.currentTopicId = null;
+          this.chatMessages = [];
+        }
+        // 分类近期记录
 
-          const today = new Date()
-          today.setHours(0, 0, 0, 0)
+        const today = new Date()
+        today.setHours(0, 0, 0, 0)
 
-          const yesterday = new Date(today)
-          yesterday.setDate(yesterday.getDate() - 1)
+        const yesterday = new Date(today)
+        yesterday.setDate(yesterday.getDate() - 1)
 
-          const dayBeforeYesterday = new Date(today)
-          dayBeforeYesterday.setDate(dayBeforeYesterday.getDate() - 2)
+        const dayBeforeYesterday = new Date(today)
+        dayBeforeYesterday.setDate(dayBeforeYesterday.getDate() - 2)
 
-          const sevenDaysAgo = new Date(today)
-          sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7)
+        const sevenDaysAgo = new Date(today)
+        sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7)
 
-          const thirtyDaysAgo = new Date(today)
-          thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)
+        const thirtyDaysAgo = new Date(today)
+        thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)
 
-          // 清空之前的分类
-          this.classifiedRecent = {
-            today: [],
-            yesterday: [],
-            dayBeforeYesterday: [],
-            within7Days: [],
-            within30Days: []
-          };
-          this.classifiedMonthly = {};
-
-          this.topicList.forEach(record => {
-            const recordDate = new Date(record.createTime)
-            recordDate.setHours(0, 0, 0, 0)
-
-            if (recordDate.getTime() === today.getTime()) {
-              this.classifiedRecent.today.push(record)
-            } else if (recordDate.getTime() === yesterday.getTime()) {
-              this.classifiedRecent.yesterday.push(record)
-            } else if (recordDate.getTime() === dayBeforeYesterday.getTime()) {
-              this.classifiedRecent.dayBeforeYesterday.push(record)
-            } else if (recordDate > sevenDaysAgo) {
-              this.classifiedRecent.within7Days.push(record)
-            } else if (recordDate > thirtyDaysAgo) {
-              this.classifiedRecent.within30Days.push(record)
-            } else if (recordDate <= thirtyDaysAgo) {
-              const monthKey = this.getMonthKey(recordDate)
-
-              if (!this.classifiedMonthly[monthKey]) {
-                this.classifiedMonthly[monthKey] = []
-              }
-
-              this.classifiedMonthly[monthKey].push(record)
+        // 清空之前的分类
+        this.classifiedRecent = {
+          today: [],
+          yesterday: [],
+          dayBeforeYesterday: [],
+          within7Days: [],
+          within30Days: []
+        };
+        this.classifiedMonthly = {};
+
+        this.topicList.forEach(record => {
+          const recordDate = new Date(record.createTime)
+          recordDate.setHours(0, 0, 0, 0)
+
+          if (recordDate.getTime() === today.getTime()) {
+            this.classifiedRecent.today.push(record)
+          } else if (recordDate.getTime() === yesterday.getTime()) {
+            this.classifiedRecent.yesterday.push(record)
+          } else if (recordDate.getTime() === dayBeforeYesterday.getTime()) {
+            this.classifiedRecent.dayBeforeYesterday.push(record)
+          } else if (recordDate > sevenDaysAgo) {
+            this.classifiedRecent.within7Days.push(record)
+          } else if (recordDate > thirtyDaysAgo) {
+            this.classifiedRecent.within30Days.push(record)
+          } else if (recordDate <= thirtyDaysAgo) {
+            const monthKey = this.getMonthKey(recordDate)
+
+            if (!this.classifiedMonthly[monthKey]) {
+              this.classifiedMonthly[monthKey] = []
             }
-          })
-        }
-      } catch (err) {
-        console.error('获取数据失败:', err)
+
+            this.classifiedMonthly[monthKey].push(record)
+          }
+        })
+      } catch (error) {
+        console.error('获取话题列表失败:', error)
+        ElMessage.error('获取话题列表失败')
       } finally {
         this.loading = false
       }

oa-ui/src/views/llm/knowledge/index.vue

@@ -586,7 +586,7 @@ export default {
             clearTimeout(window.responseTimeout);
           }
 
-          // 重新设置超时定时器（30秒无新消息才超时）
+          // 重新设置超时定时器（5分钟无新消息才超时）
           window.responseTimeout = setTimeout(() => {
             if (that.isSending) {
               console.log('=== 响应超时强制结束 ===')
@@ -597,7 +597,7 @@ export default {
               }
               window.responseTimeout = null;
             }
-          }, 30000); // 30秒无响应超时
+          }, 300000); // 30秒无响应超时
 
           // 滚动到底部
           that.$nextTick(() => {
@@ -696,7 +696,7 @@ export default {
           }
           window.responseTimeout = null;
         }
-      }, 30000); // 30秒超时
+      }, 300000); // 5分钟超时
     },
 
     /** 停止生成回答 */

oa-ui/src/views/system/user/profile/index.vue

@@ -20,7 +20,7 @@
               </div>
 
               <div class="info-item" v-for="item in userInfo">
-                <div class="item-label" v-if="item.value != '' && item.value != undefined">
+                <div class="item-label" v-if="item.value != '' && item.value != null">
                   <svg-icon :icon-class="item.icon" class="info-icon"></svg-icon>
                   <div class="item-label">{{ item.label }}</div>
                 </div>
@@ -215,7 +215,7 @@ export default {
           {
             label: '紧急联系方式：',
             icon: 'user',
-            value: this.user.contact ? this.user.contact : '' + this.user.telephone ? this.user.telephone : ''
+            value: (this.user.contact ? this.user.contact : '') + (this.user.telephone ? this.user.telephone : '')
           },
           {
             label: '备注：',

oa-ui/src/views/system/user/profile/userInfo.vue

@@ -2,10 +2,10 @@
  * @Author: wrh
  * @Date: 2024-01-03 08:55:38
  * @LastEditors: wrh
- * @LastEditTime: 2026-02-27 11:34:24
+ * @LastEditTime: 2026-02-27 15:48:01
 -->
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+  <el-form ref="form" :model="form" :rules="rules" label-width="110px">
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="form.nickName" maxlength="30" />
     </el-form-item> 
@@ -69,7 +69,12 @@ export default {
           { required: true, message: "紧急联系人不能为空", trigger: "blur" }
         ],
         telephone: [
-          { required: true, message: "紧急联系电话不能为空", trigger: "blur" }
+          { required: true, message: "紧急联系电话不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
         ],
         phonenumber: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },