Merge pull request #109 from homenoc/develop

v4.1.2
homenoc · Jul 23, 2021 · 91b42fa · 91b42fa
2 parents 8cf9f51 + ebca509
commit 91b42fa
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/pkg/api/core/notice/v0/admin.go b/pkg/api/core/notice/v0/admin.go
@@ -48,20 +48,24 @@ func AddByAdmin(c *gin.Context) {
 	}
 
 	var userIDArray []uint
+	var userArray []core.User
 
-	for _, tmpID := range userExtraction(input.UserID, input.GroupID, input.NOCID) {
-		userIDArray = append(userIDArray, tmpID)
-	}
+	if !*input.Everyone {
+		for _, tmpID := range userExtraction(input.UserID, input.GroupID, input.NOCID) {
+			userIDArray = append(userIDArray, tmpID)
+		}
 
-	resultUser := dbUser.GetArray(userIDArray)
-	if resultUser.Err != nil {
-		log.Println(resultUser.Err.Error())
-		c.JSON(http.StatusInternalServerError, common.Error{Error: resultUser.Err.Error()})
-		return
+		resultUser := dbUser.GetArray(userIDArray)
+		if resultUser.Err != nil {
+			log.Println(resultUser.Err.Error())
+			c.JSON(http.StatusInternalServerError, common.Error{Error: resultUser.Err.Error()})
+			return
+		}
+		userArray = resultUser.User
 	}
 
 	if _, err = dbNotice.Create(&core.Notice{
-		User:      resultUser.User,
+		User:      userArray,
 		Everyone:  input.Everyone,
 		StartTime: startTime,
 		EndTime:   endTime,