Merge branch 'dev'

api/controller/Comment.go

@@ -125,7 +125,7 @@ func (b *CaseComment) GetCaseCommentPage(c *gin.Context) {
 				isLike, _ = caseCommentLikeDao.GetCaseCommentLikeCount(maps)
 
 				// 加载数据-点赞
-				commentDto.LoadIsLike(isLike)
+				caseCommentDto.LoadIsLike(isLike)
 			}
 
 			// 处理剩余评论数量字段

api/dao/Case.go

@@ -155,19 +155,29 @@ func (r *CaseDao) GetCasePageSearch(req requests.GetCasePage, page, pageSize int
 
 	// 是否已参与（0:全部 1:已参与 2:未参与）
 	if req.IsTakePart == 1 {
+		var userIds []int64
+		global.Db.Model(&model.User{}).
+			Select("user_id").
+			Where("mobile_encryption = (SELECT mobile_encryption FROM user WHERE user_id = ?)", req.UserId).
+			Find(&userIds)
+
 		caseUserSubQuery := global.Db.Model(&model.CaseUser{}).
 			Where("case_user.case_id  = case.case_id").
-			Where("case_user.platform_id = ?", req.PlatformId).
-			Where("case_user.user_id = ?", req.UserId)
+			Where("case_user.user_id IN (?)", userIds)
 
 		query = query.Where("EXISTS (?)", caseUserSubQuery)
 	}
 
 	if req.IsTakePart == 2 {
+		var userIds []int64
+		global.Db.Model(&model.User{}).
+			Select("user_id").
+			Where("mobile_encryption = (SELECT mobile_encryption FROM user WHERE user_id = ?)", req.UserId).
+			Find(&userIds)
+
 		caseUserSubQuery := global.Db.Model(&model.CaseUser{}).
 			Where("case_user.case_id  = case.case_id").
-			Where("case_user.platform_id = ?", req.PlatformId).
-			Where("case_user.user_id = ?", req.UserId)
+			Where("case_user.user_id IN (?)", userIds)
 
 		query = query.Where("NOT EXISTS (?)", caseUserSubQuery)
 	}

api/service/User.go

@@ -105,8 +105,8 @@ func (r *UserService) GetUserInfo(tx *gorm.DB, req requests.Login) (user *model.
 			// 修改用户
 			userData := make(map[string]interface{})
 			if user.UserName != req.DoctorName {
-				userData["user_name"] = req.HospitalName
-				user.UserName = req.HospitalName
+				userData["user_name"] = req.DoctorName
+				user.UserName = req.DoctorName
 			}
 
 			if user.MobileEncryption != req.MobileEncryption {
@@ -341,6 +341,16 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId
 		return nil
 	}
 
+	// 默认为白名单用户
+	isWhite := true
+	if projectPlatform.IsWhite == 1 {
+		projectPlatformWhiteService := ProjectPlatformWhiteService{}
+		isWhite, err = projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId)
+		if err != nil {
+			return err
+		}
+	}
+
 	// 获取需发放积分
 	score := 0
 	appScoreTypeStr := ""   // 积分发放原因-app
@@ -372,16 +382,7 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId
 		nodeName = "优质留言"
 	}
 
-	// 检测白名单-无需检测白名单
-	var isWhite bool
-	if projectPlatform.IsWhite == 1 {
-		projectPlatformWhiteService := ProjectPlatformWhiteService{}
-		isWhite, err = projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId)
-		if err != nil {
-			return err
-		}
-	}
-
+	// 佳动力需求：非白名单用户也需要请求积分记录
 	// 当用户为非白名单时，重置积分数
 	if isWhite == false {
 		score = 0
@@ -440,7 +441,6 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId
 		NodeName:   nodeName,
 		Score:      score,
 	}
-
 	recordScore, err = recordScoreDao.AddRecordScore(tx, recordScore)
 	if err != nil {
 		return err

log/case-api.log

@@ -32,3 +32,40 @@ time="2025-03-05 11:41:25" level=info msg="获取app数据返回" data="{\"code\
 time="2025-03-05 11:41:25" level=info msg=access http_status=200 ip=127.0.0.1 method=POST params="map[platform_key:123456 source:2 token:eyJUeXBlIjoiSnd0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJ1c2VyX25hbWUiOiJ1TjhVMHJVMGNpMVU1V0ZVZFRoIiwiZXhwIjoxNzQxNTc3NTEzfQ.41k4bM3OGxdUAWAfnTjcuFCal9itdzMsHcnUITrw_mg]" total_time=1.97384675s uri=/login
 time="2025-03-06 11:22:48" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[]" total_time=1.219134833s uri=/case/1897462563885551616
 time="2025-03-06 11:45:02" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[]" total_time=1.434719333s uri=/case/1897462563885551616
+time="2025-03-14 16:25:56" level=info msg=access http_status=200 ip=127.0.0.1 method=POST params="map[]" total_time=42.924459ms uri=/comment/like/1900462952968884224
+time="2025-03-14 16:26:09" level=info msg=access http_status=200 ip=127.0.0.1 method=POST params="map[]" total_time=481.678334ms uri=/comment/like/1900462952968884224
+time="2025-03-14 17:16:06" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=125.183208ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:17:35" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=751.068542ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:23:59" level=info msg=access http_status=200 ip=127.0.0.1 method=POST params="map[]" total_time=270.686584ms uri=/comment/like/1900462952968884224
+time="2025-03-14 17:26:02" level=info msg=access http_status=200 ip=127.0.0.1 method=POST params="map[]" total_time=451.114292ms uri=/comment/like/1900462952968884224
+time="2025-03-14 17:28:31" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[case_id:1900109888462262272 page:1 page_size:10 project_id:1900109848129835008]" total_time=1.728900042s uri="/comment/page?case_id=1900109888462262272&project_id=1900109848129835008&page=1&page_size=10"
+time="2025-03-14 17:30:27" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[case_id:1900109888462262272 page:1 page_size:10 project_id:1900109848129835008]" total_time=1m1.229424709s uri="/comment/page?case_id=1900109888462262272&project_id=1900109848129835008&page=1&page_size=10"
+time="2025-03-14 17:33:44" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[case_id:1900109888462262272 page:1 page_size:10 project_id:1900109848129835008]" total_time=1.669419333s uri="/comment/page?case_id=1900109888462262272&project_id=1900109848129835008&page=1&page_size=10"
+time="2025-03-14 17:47:10" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=745.338792ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:47:37" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=787.052625ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:47:58" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=416.591833ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:48:15" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=413.925542ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:50:07" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900107510614855680]" total_time=987.215833ms uri="/case/page?project_id=1900107510614855680&is_take_part=1"
+time="2025-03-14 17:50:15" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=476.449459ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:52:09" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=425.364167ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 17:54:52" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=445.446208ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 17:55:08" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=780.774ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 17:56:08" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=755.997834ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 17:56:58" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=759.585334ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 17:58:34" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=611.870416ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 17:59:39" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=815.768708ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 18:03:25" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=436.666291ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 18:03:30" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=703.908167ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:04:21" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=803.253583ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:10:51" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=447.065833ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:11:05" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=797.357125ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 18:12:20" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=505.207667ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:13:29" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900443789521063936]" total_time=467.341709ms uri="/case/page?project_id=1900443789521063936&is_take_part=1"
+time="2025-03-14 18:13:34" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=792.205125ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:16:01" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=851.480167ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:16:10" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=826.810458ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:16:24" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900443789521063936]" total_time=857.404833ms uri="/case/page?project_id=1900443789521063936&is_take_part=2"
+time="2025-03-14 18:16:43" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=444.610166ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"
+time="2025-03-14 18:16:46" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900107510614855680]" total_time=445.595042ms uri="/case/page?project_id=1900107510614855680&is_take_part=1"
+time="2025-03-14 18:17:58" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:1 project_id:1900107510614855680]" total_time=852.441291ms uri="/case/page?project_id=1900107510614855680&is_take_part=1"
+time="2025-03-14 18:18:01" level=info msg=access http_status=200 ip=127.0.0.1 method=GET params="map[is_take_part:2 project_id:1900107510614855680]" total_time=465.530875ms uri="/case/page?project_id=1900107510614855680&is_take_part=2"