From 4324117e156e063cb2a266151724690bd295e180 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 18 七月 2023 19:38:42 +0800
Subject: [PATCH] fix
---
service/user.go | 4 ++
service/dataServer.go | 8 ++++
model/user.go | 13 ++++++
docs/swagger.yaml | 10 +++++
docs/docs.go | 14 +++++++
docs/swagger.json | 14 +++++++
model/response/response.go | 4 ++
7 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 85c7809..7e039cd 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -9109,6 +9109,13 @@
"$ref": "#/definitions/model.Country"
}
},
+ "department": {
+ "description": "閮ㄩ棬",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Department"
+ }
+ },
"enterprise_nature": {
"description": "浼佷笟鎬ц川",
"type": "array",
@@ -9130,6 +9137,13 @@
"$ref": "#/definitions/model.Industry"
}
},
+ "member": {
+ "description": "Member",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.User"
+ }
+ },
"province": {
"description": "鐪佷唤鏁版嵁",
"type": "array",
diff --git a/docs/swagger.json b/docs/swagger.json
index 31447c4..9607f46 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -9097,6 +9097,13 @@
"$ref": "#/definitions/model.Country"
}
},
+ "department": {
+ "description": "閮ㄩ棬",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Department"
+ }
+ },
"enterprise_nature": {
"description": "浼佷笟鎬ц川",
"type": "array",
@@ -9118,6 +9125,13 @@
"$ref": "#/definitions/model.Industry"
}
},
+ "member": {
+ "description": "Member",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.User"
+ }
+ },
"province": {
"description": "鐪佷唤鏁版嵁",
"type": "array",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index b9f4ea0..c7dd501 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2766,6 +2766,11 @@
items:
$ref: '#/definitions/model.Country'
type: array
+ department:
+ description: 閮ㄩ棬
+ items:
+ $ref: '#/definitions/model.Department'
+ type: array
enterprise_nature:
description: 浼佷笟鎬ц川
items:
@@ -2781,6 +2786,11 @@
items:
$ref: '#/definitions/model.Industry'
type: array
+ member:
+ description: Member
+ items:
+ $ref: '#/definitions/model.User'
+ type: array
province:
description: 鐪佷唤鏁版嵁
items:
diff --git a/model/response/response.go b/model/response/response.go
index 3fcc727..4a69550 100644
--- a/model/response/response.go
+++ b/model/response/response.go
@@ -211,6 +211,10 @@
SalesSource []*model.SalesSources `json:"sales_source"`
// 鑰佸鎴疯惀閿�
RegularCustomers []*model.RegularCustomers `json:"regular_customers"`
+ // Member
+ Member []*model.User `json:"member"`
+ // 閮ㄩ棬
+ Department []*model.Department `json:"department"`
}
DepartmentResponse struct {
diff --git a/model/user.go b/model/user.go
index 69cfc0c..d303b78 100644
--- a/model/user.go
+++ b/model/user.go
@@ -257,3 +257,16 @@
func (slf *UserSearch) ReplaceMenu(user *User, menus []*Menu) error {
return slf.Orm.Model(user).Association("Menus").Replace(menus)
}
+
+func (slf *UserSearch) FindAll() ([]*User, error) {
+ var (
+ records = make([]*User, 0)
+ db = slf.build()
+ )
+
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find all err: %v", err)
+ }
+
+ return records, nil
+}
diff --git a/service/dataServer.go b/service/dataServer.go
index 01bd19a..c29d5f8 100644
--- a/service/dataServer.go
+++ b/service/dataServer.go
@@ -72,6 +72,14 @@
regularCustomerList, _ := ServiceGroup.GetRegularCustomersList()
data.RegularCustomers = regularCustomerList
+ // get Member list
+ memberList, _ := ServiceGroup.GetUserList()
+ data.Member = memberList
+
+ // get Department list
+ departmentList, _ := ServiceGroup.GetDepartmentList()
+ data.Department = departmentList
+
errCode = ecode.OK
return
diff --git a/service/user.go b/service/user.go
index 2adb136..fe288de 100644
--- a/service/user.go
+++ b/service/user.go
@@ -89,3 +89,7 @@
"password": encrypt.BcryptHash("123456"),
})
}
+
+func (userService *UserService) GetUserList() (userList []*model.User, err error) {
+ return model.NewUserSearch(nil).FindAll()
+}
--
Gitblit v1.8.0