Merge branch 'yhg_250102' into debug

internal/logic/User/do_gpts_user_login_logic.go

@@ -35,6 +35,13 @@ func (l *DoGptsUserLoginLogic) DoGptsUserLogin(req *types.GptsUserLoginReq) (res
 			Username: *req.Username,
 		})
 
+	if err != nil {
+		return nil, errorx.NewCodeInvalidArgumentError("用户名或密码错误")
+	}
+	if user == nil {
+		return nil, errorx.NewCodeInvalidArgumentError("用户名或密码错误")
+	}
+
 	if user.Status != nil && *user.Status != uint32(utils.StatusNormal) {
 		return nil, errorx.NewCodeInvalidArgumentError("login.userBanned")
 	}

internal/logic/Wxhook/get_friends_and_groups_logic.go

@@ -153,11 +153,14 @@ func (l *GetFriendsAndGroupsLogic) GetFriendsAndGroups(req *types.IDReq) (resp *
 				if len(newFriendIds) > 0 && len(newLagIds) > 0 {
 					for id, lags := range newFriendIds {
 						for _, lag := range lags {
-							l.svcCtx.DB.LabelRelationship.Create().
-								SetLabelID(wxSysSet[lag]).
-								SetContactID(id).
-								SetOrganizationID(organizationId).
-								Save(l.ctx)
+							label_id := wxSysSet[lag]
+							if label_id != 0 {
+								l.svcCtx.DB.LabelRelationship.Create().
+									SetLabelID(label_id).
+									SetContactID(id).
+									SetOrganizationID(organizationId).
+									Save(l.ctx)
+							}
 						}
 					}
 				}

internal/logic/sop_stage/sop_stage_copy_logic.go

@@ -42,6 +42,9 @@ func (l *SopStageCopyLogic) SopStageCopy(req *types.StageCopyReq) (resp *types.B
 		return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 	}
 
+	// 查询任务的阶段数量
+	count, err := l.svcCtx.DB.SopStage.Query().Where(sopstage.TaskIDEQ(data.TaskID)).Count(l.ctx)
+
 	//  创建新阶段
 	newStage, err := tx.SopStage.Create().
 		SetTaskID(data.TaskID).
@@ -53,7 +56,7 @@ func (l *SopStageCopyLogic) SopStageCopy(req *types.StageCopyReq) (resp *types.B
 		SetNotNilActionLabelAdd(data.ActionLabelAdd).
 		SetNotNilActionLabelDel(data.ActionLabelDel).
 		SetNotNilActionForward(&data.ActionForward).
-		SetIndexSort(data.IndexSort).
+		SetIndexSort(count + 1).
 		Save(l.ctx)
 	if err != nil {
 		_ = tx.Rollback()