From 1493c66778aa13b2a3116d930efeec6cf38ab358 Mon Sep 17 00:00:00 2001
From: renzhiyuan <465386466@qq.com>
Date: Fri, 29 Nov 2024 17:12:29 +0800
Subject: [PATCH] uint ->int

---
 app/http/entities/backend/user.go         | 15 +++++++++------
 app/http/routes/admin.go                  |  2 +-
 app/services/user_service/user_service.go | 12 ++++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/http/entities/backend/user.go b/app/http/entities/backend/user.go
index f145f4f..1d78bc3 100644
--- a/app/http/entities/backend/user.go
+++ b/app/http/entities/backend/user.go
@@ -6,12 +6,15 @@ import (
 )
 
 type UserListRequest struct {
-	Page    int      `json:"page" validate:"required" form:"page" example:"1"`
-	Limit   int      `json:"limit" validate:"required" form:"limit" example:"10"`
-	Tel     string   `json:"tel" form:"tel" example:"155555555"`
-	Status  int      `json:"status" form:"status" example:"1"`
-	Name    string   `json:"name" form:"name" example:"46516"`
-	UserIds []string `json:"user_ids"`
+	Page        int      `json:"page" validate:"required" form:"page" example:"1"`
+	Limit       int      `json:"limit" validate:"required" form:"limit" example:"10"`
+	Tel         string   `json:"tel" form:"tel" example:"155555555"`
+	Status      int      `json:"status" form:"status" example:"1"`
+	Name        string   `json:"name" form:"name" example:"46516"`
+	DtalkUserId string   `json:"dtalk_user_id"`
+	DtalkDepId  string   `json:"dtalk_dep_id"`
+	WxOpenId    string   `json:"wx_open_id"`
+	UserIds     []string `json:"user_ids"`
 }
 
 type UserInfoRequest struct {
diff --git a/app/http/routes/admin.go b/app/http/routes/admin.go
index 8080e00..a347dfa 100644
--- a/app/http/routes/admin.go
+++ b/app/http/routes/admin.go
@@ -35,7 +35,7 @@ func RegisterAdminRoute(router *gin.Engine) {
 					user.POST("/list", backend.UserList)
 					user.POST("/add", backend.UserAdd)
 					user.POST("/edit", backend.UserEdit)
-					user.POST("/del", backend.UserDel)
+					user.DELETE("/del", backend.UserDel)
 				}
 				//数据库管理
 				sql := v1.Group("/sql")
diff --git a/app/services/user_service/user_service.go b/app/services/user_service/user_service.go
index 2489b31..200b386 100644
--- a/app/services/user_service/user_service.go
+++ b/app/services/user_service/user_service.go
@@ -12,12 +12,24 @@ import (
 func GetListByWhere(request *backend.UserListRequest, page int, limit int) (count int64, UserListInfo []cronusermodel.CronUser, err error) {
 	cond := builder.NewCond()
 
+	if request.Name != "" {
+		cond = cond.And(builder.Like{"name", request.Name})
+	}
 	if request.Tel != "" {
 		cond = cond.And(builder.Like{"tel", request.Tel})
 	}
 	if request.Status != 0 {
 		cond = cond.And(builder.Eq{"status": request.Status})
 	}
+	if request.DtalkDepId != "" {
+		cond = cond.And(builder.Like{"dtalk_dep_id", request.DtalkDepId})
+	}
+	if request.DtalkUserId != "" {
+		cond = cond.And(builder.Like{"dtalk_user_id", request.DtalkUserId})
+	}
+	if request.DtalkUserId != "" {
+		cond = cond.And(builder.Like{"dtalk_user_id", request.DtalkUserId})
+	}
 	if len(request.UserIds) > 0 {
 		// 使用IN查询
 		cond = cond.And(builder.In("user_id", request.UserIds))