Merge branch 'master' into yhg_240730

internal/logic/Wxhook/get_friends_and_groups_logic.go

@@ -94,7 +94,12 @@ func (l *GetFriendsAndGroupsLogic) GetFriendsAndGroups(req *types.IDReq) (resp *
 				wxLagIdsSet[wxLagId.Id] = wxLagId.Name
 			}
 			for lagId := range newLagIds {
+				if lagId == "" {
+					continue
+				}
+				l.Logger.Errorf("------------------------lagId--------------------------- %+v", lagId)
 				name := wxLagIdsSet[lagId]
+				l.Logger.Errorf("------------------------name--------------------------- %+v", name)
 				label, err := l.svcCtx.DB.Label.Query().
 					Where(
 						label.NameEQ(name), // Filter by ID
@@ -102,6 +107,7 @@ func (l *GetFriendsAndGroupsLogic) GetFriendsAndGroups(req *types.IDReq) (resp *
 						label.OrganizationID(organizationId), // Additional filter by organizationId
 					).
 					Only(l.ctx)
+				l.Logger.Errorf("------------------------err--------------------------- %+v", err)
 				if err != nil {
 					// 如果标签不存在则创建
 					newLabel, err := l.svcCtx.DB.Label.Create().

internal/middleware/authority_middleware.go

@@ -55,10 +55,8 @@ func (m *AuthorityMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc {
 		}
 
 		result := batchCheck(m.Cbn, roleIds, act, obj)
-		logx.Errorw("------------------------result--------------------------- ", logx.Field("detail", result))
 		if result {
 			userIdStr := r.Context().Value("userId").(string)
-			logx.Errorw("------------------------userIdStr--------------------------- ", logx.Field("detail", userIdStr))
 			logx.Infow("HTTP/HTTPS Request", logx.Field("UUID", userIdStr),
 				logx.Field("path", obj), logx.Field("method", act))
 			data, err := m.CoreRpc.GetUserById(r.Context(), &core.UUIDReq{Id: userIdStr})