xg

api/internal/logic/ignoreactionlogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jypkg/ent/util"
 	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
 	"context"
 	"fmt"
@@ -33,7 +34,7 @@ func (l *IgnoreActionLogic) IgnoreAction(req *types.IgnoreReq) (resp *types.Repl
 	query := map[string]interface{}{
 		"position_id": req.PositionId,
 		"itype":       req.Source,
-		"relate_id":   req.RelateId,
+		"relate_id":   util.DecodeId(req.RelateId),
 	}
 	info := T.CrmMysql.FindOne("connection_status", query, "id", "")
 	if info != nil && len(*info) > 0 {

api/internal/logic/infodetaillogic.go

@@ -44,8 +44,9 @@ func (l *InfoDetailLogic) InfoDetail(req *types.InfoDetailReq) (resp *types.Repl
 	resp = &types.Reply{}
 	sql := `SELECT title, summary, content, basis, area, city, datajson_id FROM information.information WHERE id = ?`
 	info := Infomation{}
-	err = T.ClickhouseConn.QueryRow(context.TODO(), sql, req.InfoId).ScanStruct(&info)
-	if err == nil {
+	row := T.ClickhouseConn.QueryRow(context.TODO(), sql, req.InfoId)
+	err1 := row.ScanStruct(&info)
+	if err1 == nil {
 		info.DataJsonId = encrypt.CommonEncodeArticle("content", info.DataJsonId)
 		binfo, b := T.MgoBidding.FindById("bidding", info.DataJsonId, map[string]interface{}{"title": 1, "projectname": 1})
 		if b && binfo != nil && len(*binfo) > 0 {

api/internal/service/plistService.go

@@ -91,15 +91,17 @@ func GetProjectList(req *types.ProjectListReq) (resultList []*ProjectEntry, hasN
 			} else {
 				resultList = resultList[:req.PageSize]
 			}
+			hasNextPage = true
+		} else {
+			hasNextPage = false
 		}
 	} else {
 		total = int(T.NetworkCom.Count(countSql))
-	}
-	total = len(resultList)
-	if total > req.PageSize {
-		hasNextPage = true
-	} else {
-		hasNextPage = false
+		if total > req.PageSize {
+			hasNextPage = true
+		} else {
+			hasNextPage = false
+		}
 	}
 	moreInfo(req, resultList) //  补充信息