Merge branch 'dev/v1.2.6_rjj' of SocialPlatform/messageCenter into feature/v1.2.6

.idea/workspace.xml

@@ -6,20 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="f5220264-ecf0-4305-ada3-6105184077a7" name="Changes" comment="提交">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/handler/routes.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/handler/routes.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/types/types.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/types/types.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/messagecenter.api" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/messagecenter.api" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/internal/logic/countlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/internal/logic/countlogic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/internal/logic/savemessagelogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/internal/logic/savemessagelogic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/internal/server/messagecenterserver.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/internal/server/messagecenterserver.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/access.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/access.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/slow.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/slow.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/messagecenter.proto" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/messagecenter.proto" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter.pb.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter_grpc.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/messagecenter/messagecenter_grpc.pb.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/service/message_mail_box.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/message_mail_box.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -289,7 +278,8 @@
     <MESSAGE value="未读sql修改" />
     <MESSAGE value="历史聊天记录查询" />
     <MESSAGE value="提交" />
-    <option name="LAST_COMMIT_MESSAGE" value="提交" />
+    <MESSAGE value="未读消息修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="未读消息修改" />
   </component>
   <component name="VgoProject">
     <integration-enabled>true</integration-enabled>
@@ -314,11 +304,6 @@
           <line>254</line>
           <option name="timeStamp" value="9" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>705</line>
-          <option name="timeStamp" value="10" />
-        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="DlvErrorBreakpoint" />

service/message_mail_box.go

@@ -632,7 +632,9 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) *[]map[string
 			"LEFT JOIN  %s d on  d.id=a.receive_user_id  "+
 			"where  a.own_id=  %d and a.iswithdraw = 0"+
 			"AND ((a.send_user_id= %d AND   a.receive_user_id=   %d) or (a.send_user_id=  %d AND  a.receive_user_id=  %d)) "+
-			"AND  a.type=2  %s "+
+			"AND  a.type IN ( 2, 6 )  %s "+
+			"AND a.chat_group_id = 0 "+
+			"AND a.send_user_type = a.receive_user_type "+
 			"ORDER BY a.create_time desc,a.id   asc "+
 			"limit 0 ,  %d ",
 			util.SOCIALIZE_MESSAGE_MAILBOX, util.SOCIALIZE_MESSAGE, util.BASE_USER, util.BASE_USER,
@@ -664,6 +666,7 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) *[]map[string
 				"AND (a.type = 5 or a.type=4 or a.type=6 or  a.type=7 or a.type=8 )   "+
 				"AND c.ent_id =   %d "+
 				"AND c.user_id =   %d  %s "+
+				"AND a.send_user_type != a.receive_user_type "+
 				"ORDER BY a.create_time desc ,a.id asc "+
 				"limit 0 ,  %d ",
 				util.SOCIALIZE_MESSAGE_MAILBOX, util.SOCIALIZE_MESSAGE, util.SOCIALIZE_CHAT_SESSION,
@@ -680,6 +683,7 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) *[]map[string
 				"AND a.own_id =  %d "+
 				"AND  c.ent_id = %d "+
 				"AND c.user_id =  %d "+
+				"AND a.send_user_type != a.receive_user_type "+
 				"AND ( a.type = 4 OR a.type = 5 or a.type=6 or  a.type=7 or  a.type=8)  %s "+
 				"ORDER BY a.create_time  desc,a.id   asc "+
 				"limit 0 ,   %d ",
@@ -701,14 +705,13 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) *[]map[string
 		}
 
 	}
-	log.Println(in.MsgType, len(*data))
 	if (in.MsgType == 3 || in.MsgType == 2) && data != nil && len(*data) > 0 {
 		_, _, positionData := EntPerson(in.EntId, true)
 		for _, v := range *data {
 			positionId := quitl.IntAll(v["send_position_id"])
 			if positionId != 0 {
 				v["userName"] = positionData[positionId]
-				log.Println(v["userName"], positionData[positionId])
+				//log.Println(v["userName"], positionData[positionId])
 			}
 		}