jz.kai 2 gadi atpakaļ
vecāks
revīzija
45ad1032d8

+ 1 - 1
web/src/main/java/com/jpsoft/excellent/modules/base/controller/FeedbackOpinionController.java

@@ -502,7 +502,7 @@ public class FeedbackOpinionController {
             searchParams.put("reportDateEnd",sdf.format(calendar.getTime()));
             searchParams.put("reportDateEnd",sdf.format(calendar.getTime()));
         }
         }
 
 
-        Page<FeedbackOpinion> page = feedbackOpinionService.pageSearch(searchParams,1,10000,false,sortList);
+        Page<FeedbackOpinion> page = feedbackOpinionService.pageSearch(searchParams,1,100000,false,sortList);
         //写入数据
         //写入数据
         for(int i=0; i<page.getResult().size(); i++){
         for(int i=0; i<page.getResult().size(); i++){
             FeedbackOpinion feedbackOpinion = page.getResult().get(i);
             FeedbackOpinion feedbackOpinion = page.getResult().get(i);

+ 6 - 0
web/src/main/java/com/jpsoft/excellent/modules/base/controller/MessageController.java

@@ -376,6 +376,12 @@ public class MessageController {
         for(Message message : page.getResult()){
         for(Message message : page.getResult()){
             User user = userService.get(message.getCreateBy());
             User user = userService.get(message.getCreateBy());
             message.setCreateByName(user.getRealName());
             message.setCreateByName(user.getRealName());
+
+            //接收人
+            List<MessageSend> messageSend = messageSendService.findByMessageId(message.getId(),subject);
+            if(messageSend.size() > 0){
+                message.setReadStatus(messageSend.get(0).getIsReaded());
+            }
         }
         }
 
 
         msgResult.setResult(true);
         msgResult.setResult(true);

+ 5 - 5
web/src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ server:
 
 
 spring:
 spring:
   datasource:
   datasource:
-#    url: jdbc:log4jdbc:mysql://39.104.144.104:3308/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#    username: root
-#    password: jpsoft8121234
-    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://39.104.144.104:3308/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     username: root
-    password: jpsoft2016
+    password: jpsoft8121234
+#    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft2016
   devtools:
   devtools:
     add-properties: false
     add-properties: false
     restart:
     restart: