Merge branch 'V20220125' of git.openi.org.cn:OpenI/aiforge into benchmark

models/action.go

@@ -350,6 +350,7 @@ func GetLast20PublicFeeds(opTypes []int) ([]*Action, error) {
 	cond := builder.NewCond()
 	cond = cond.And(builder.Eq{"is_private": false})
 	cond = cond.And(builder.Eq{"is_deleted": false})
+	cond = cond.And(builder.Expr("user_id=act_user_id"))
 	cond = cond.And(builder.In("op_type", opTypes))
 
 	actions := make([]*Action, 0, 20)

models/user_business_analysis.go

@@ -387,7 +387,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, CommitCodeSizeMap map[s
 
 	OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix)
 
-	DataDate := currentTimeNow.Format("2006-01-02")
+	DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"
 
 	cond := "type != 1 and is_active=true"
 	count, err := sess.Where(cond).Count(new(User))

routers/repo/user_data_analysis.go

@@ -88,7 +88,7 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 				xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3])
 
 				formatTime = userRecord.DataDate
-				xlsx.SetCellValue(sheetName, "Q"+rows, formatTime+" 00:01")
+				xlsx.SetCellValue(sheetName, "Q"+rows, formatTime)
 			}
 
 			//设置默认打开的表单

web_src/js/components/UserAnalysis.vue

@@ -135,13 +135,10 @@
                     </template>
                 </el-table-column>   
                 <el-table-column
-                    prop="CountDate"
+                    prop="DataDate"
                     label="系统统计时间"
                     width="120px"
                     align="center">
-                    <template slot-scope="scope">
-                        {{scope.row.CountDate | transformTimestamp}}
-                    </template>
                 </el-table-column>           
             </el-table>
         </div>