fix:edit chat_session/list

internal/logic/chatsession/get_chat_session_list_logic.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
 	"github.com/suyuan32/simple-admin-common/utils/pointy"
-	"github.com/zeromicro/go-zero/core/errorx"
 	"wechat-api/ent/chatsession"
-	"wechat-api/ent/employee"
 	"wechat-api/ent/predicate"
-	"wechat-api/ent/wxcard"
 	"wechat-api/internal/utils/dberrorhandler"
 
 	"wechat-api/internal/svc"
@@ -34,39 +31,49 @@ func (l *GetChatSessionListLogic) GetChatSessionList(req *types.ChatSessionListR
 	resp := &types.ChatSessionListResp{}
 	resp.Msg = errormsg.Success
 
-	var predicates []predicate.ChatSession
-	if req.BotType == nil || *req.BotType == 0 {
-		return nil, errorx.NewInvalidArgumentError("BotId cannot be null")
-	}
-	if req.BotName != nil && *req.BotName != "" {
-		predicates = append(predicates, chatsession.BotType(*req.BotType))
+	organizationId := l.ctx.Value("organizationId").(uint64)
+	isAdmin := l.ctx.Value("isAdmin").(bool)
 
-		ids := make([]uint64, 0)
-		if *req.BotType == 2 {
-			wxcardList, err := l.svcCtx.DB.WxCard.Query().Where(wxcard.NameContains(*req.BotName)).All(l.ctx)
-			if err != nil {
-				return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
-			}
-			for _, val := range wxcardList {
-				ids = append(ids, val.ID)
-			}
-		} else if *req.BotType == 3 {
-			employeeList, err := l.svcCtx.DB.Employee.Query().Where(employee.TitleContains(*req.BotName)).All(l.ctx)
-			if err != nil {
-				return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
-			}
-			for _, val := range employeeList {
-				ids = append(ids, val.ID)
-			}
-		}
+	var predicates []predicate.ChatSession
+	if isAdmin {
 
-		if len(ids) > 0 {
-			predicates = append(predicates, chatsession.BotIDIn(ids...))
-		} else {
-			return resp, nil
-		}
+	} else {
+		predicates = append(predicates, chatsession.BotType(uint8(2)))
+		predicates = append(predicates, chatsession.BotID(organizationId))
 	}
 
+	//if req.BotType != nil && *req.BotType > 0 {
+	//	predicates = append(predicates, chatsession.BotType(*req.BotType))
+	//}
+	//if req.BotName != nil && *req.BotName != "" {
+	//	predicates = append(predicates, chatsession.BotType(*req.BotType))
+	//
+	//	ids := make([]uint64, 0)
+	//	if *req.BotType == 2 {
+	//		wxcardList, err := l.svcCtx.DB.WxCard.Query().Where(wxcard.NameContains(*req.BotName)).All(l.ctx)
+	//		if err != nil {
+	//			return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
+	//		}
+	//		for _, val := range wxcardList {
+	//			ids = append(ids, val.ID)
+	//		}
+	//	} else if *req.BotType == 3 {
+	//		employeeList, err := l.svcCtx.DB.Employee.Query().Where(employee.TitleContains(*req.BotName)).All(l.ctx)
+	//		if err != nil {
+	//			return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
+	//		}
+	//		for _, val := range employeeList {
+	//			ids = append(ids, val.ID)
+	//		}
+	//	}
+	//
+	//	if len(ids) > 0 {
+	//		predicates = append(predicates, chatsession.BotIDIn(ids...))
+	//	} else {
+	//		return resp, nil
+	//	}
+	//}
+
 	data, err := l.svcCtx.DB.ChatSession.Query().Where(predicates...).Page(l.ctx, req.Page, req.PageSize)
 
 	if err != nil {