1

controller/messageController.js

 const errorMessage = require("../utils/errorMessage");
 const { Op } = require("sequelize");
+const sequelize = require('sequelize');
 
 
 
@@ -68,16 +69,24 @@ async function getUserMessages(req, res, next) {
     try {
         const messages = await DB.Message.findAll({
             where: {
-                receivers: { [Op.contains]: [req.user.id] },
-                del: 0
+                [Op.and]: [sequelize.where(
+                    sequelize.fn('JSON_CONTAINS',
+                        sequelize.col('receivers'),
+                        sequelize.cast(req.user.id, 'JSON'), // 直接将数字转换为JSON
+                        sequelize.literal("'$'")
+                    ),
+                    true
+                ),
+                { del: 0 },
+                ]
             },
-            include: [
-                {
-                    model: DB.User,
-                    as: 'creatorInfo',
-                    attributes: ['id', 'name', 'avatar']
-                }
-            ],
+            // include: [
+            //     {
+            //         model: DB.User,
+            //         as: 'creatorInfo',
+            //         attributes: ['id', 'name', 'avatar']
+            //     }
+            // ],
             raw: true,
             order: [['createdAt', 'DESC']],
         });
@@ -102,9 +111,24 @@ async function getMesCount(req, res, next) {
     try {
         const count = await DB.Message.count({
             where: {
-                receivers: { [Op.contains]: [req.user.id] },
-                del: 0,
-                alreadyRead: { [Op.not]: {[Op.contains]: [req.user.id]} }
+                [Op.and]: [sequelize.where(
+                    sequelize.fn('JSON_CONTAINS',
+                        sequelize.col('receivers'),
+                        sequelize.cast(req.user.id, 'JSON'), // 直接将数字转换为JSON
+                        sequelize.literal("'$'")
+                    ),
+                    true
+                ),
+                { del: 0 },
+                sequelize.where(
+                    sequelize.fn('JSON_CONTAINS',
+                        sequelize.col('alreadyRead'),
+                        sequelize.cast(req.user.id, 'JSON'), // 直接将数字转换为JSON
+                        sequelize.literal("'$'")
+                    ),
+                    true
+                )
+                ]
             }
         });
         return res.sendData({ count });

controller/projectController.js

@@ -1133,6 +1133,17 @@ async function getOwnProjects(req, res, next) {
     }
 }
 
+async function getProFlowRecord(req, res, next) {
+    try {
+        let rcs = await DB.FlowRecord.findAll({where: {projectId: req.body.projectId}});
+        return res.sendData(rcs);
+    } catch (error) {
+        next(error);
+    }
+}
+
+
+
 module.exports = {
     getProjectFields,
     createProject,
@@ -1153,4 +1164,5 @@ module.exports = {
     getProjectCwpj,
     approvalLixiang,
     approvalJuece,
+    getProFlowRecord,
 }
\ No newline at end of file

router/projectRouter.js

@@ -46,6 +46,8 @@ router.post('/listProject', projectController.listProject);
 
 // router.post('/getOwnProjects', projectController.getOwnProjects);
 
+router.post('/getProFlowRecord', projectController.getProFlowRecord)
+
 
 /**
  * 投中管理