lejianwen 1 год назад
Родитель
Сommit
034ec6ca1b
1 измененных файлов с 15 добавлено и 4 удалено
  1. 15 4
      http/controller/admin/addressBook.go

+ 15 - 4
http/controller/admin/addressBook.go

@@ -4,7 +4,6 @@ import (
4
 	"Gwen/global"
4
 	"Gwen/global"
5
 	"Gwen/http/request/admin"
5
 	"Gwen/http/request/admin"
6
 	"Gwen/http/response"
6
 	"Gwen/http/response"
7
-	"Gwen/model"
8
 	"Gwen/service"
7
 	"Gwen/service"
9
 	"encoding/json"
8
 	"encoding/json"
10
 	_ "encoding/json"
9
 	_ "encoding/json"
@@ -107,9 +106,21 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
107
 		response.Fail(c, 101, errList[0])
106
 		response.Fail(c, 101, errList[0])
108
 		return
107
 		return
109
 	}
108
 	}
109
+	ul := len(f.UserIds)
110
+
111
+	if ul == 0 {
112
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
113
+		return
114
+	}
115
+	if ul > 1 {
116
+		//多用户置空标签
117
+		f.Tags = []string{}
118
+		//多用户只能创建到默认地址簿
119
+		f.CollectionId = 0
120
+	}
110
 
121
 
111
 	//创建标签
122
 	//创建标签
112
-	for _, fu := range f.UserIds {
123
+	/*for _, fu := range f.UserIds {
113
 		if fu == 0 {
124
 		if fu == 0 {
114
 			continue
125
 			continue
115
 		}
126
 		}
@@ -122,13 +133,13 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
122
 				})
133
 				})
123
 			}
134
 			}
124
 		}
135
 		}
125
-	}
136
+	}*/
126
 	ts := f.ToAddressBooks()
137
 	ts := f.ToAddressBooks()
127
 	for _, t := range ts {
138
 	for _, t := range ts {
128
 		if t.UserId == 0 {
139
 		if t.UserId == 0 {
129
 			continue
140
 			continue
130
 		}
141
 		}
131
-		ex := service.AllService.AddressBookService.InfoByUserIdAndId(t.UserId, t.Id)
142
+		ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(t.UserId, t.Id, t.CollectionId)
132
 		if ex.RowId == 0 {
143
 		if ex.RowId == 0 {
133
 			service.AllService.AddressBookService.Create(t)
144
 			service.AllService.AddressBookService.Create(t)
134
 		}
145
 		}