wangshan 2 жил өмнө
parent
commit
34e5e69c8f

+ 6 - 6
entity/workDesktop.go

@@ -393,12 +393,12 @@ func CommonlyUpdate(in *pb.WorkDesktopComprehensiveReq) (B bool, M string) {
 		existingData = BaseMysql.SelectBySqlByTx(tx, `SELECT id  FROM `+WorkCommonly+` WHERE base_userid = ? AND appid = ? AND field = ? AND userid = ?  ORDER BY id DESC `, in.NewUserId, in.AppId, in.ActionMode, in.UserId)
 		if existingData != nil && len(*existingData) > 0 {
 			id = MC.IntAll((*existingData)[0]["id"])
-		} else {
-			//P278 之前版本查询逻辑
-			existingData = BaseMysql.SelectBySqlByTx(tx, `SELECT id  FROM `+WorkCommonly+` WHERE base_userid = ? AND appid = ? AND field = ?  ORDER BY id DESC `, in.NewUserId, in.AppId, in.ActionMode)
-			if existingData != nil && len(*existingData) > 0 {
-				id = MC.IntAll((*existingData)[0]["id"])
-			}
+			//} else {
+			//	//P278 之前版本查询逻辑
+			//	existingData = BaseMysql.SelectBySqlByTx(tx, `SELECT id  FROM `+WorkCommonly+` WHERE base_userid = ? AND appid = ? AND field = ?  ORDER BY id DESC `, in.NewUserId, in.AppId, in.ActionMode)
+			//	if existingData != nil && len(*existingData) > 0 {
+			//		id = MC.IntAll((*existingData)[0]["id"])
+			//	}
 		}
 		switch {
 		case id > 0: //更新

+ 1 - 0
service/workDesktop.go

@@ -35,6 +35,7 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
 		var (
 			pIds []string
 		)
+		logx.Info("--------------------:", fmt.Sprintf(`SELECT value  FROM `+entity.WorkCommonly+` WHERE base_userid = '%s' AND appid = %s AND field = '%s' AND userid = '%s' ORDER BY id DESC `, in.NewUserId, in.AppId, in.ActionMode, in.UserId))
 		//常用功能查看
 		existingData := entity.BaseMysql.SelectBySql(`SELECT value  FROM `+entity.WorkCommonly+` WHERE base_userid = ? AND appid = ? AND field = ? AND userid = ? ORDER BY id DESC `, in.NewUserId, in.AppId, in.ActionMode, in.UserId)
 		if existingData == nil || len(*existingData) == 0 {