Browse Source

Merge branch 'feature/eta_1.6.9' into debug

hsun 1 year ago
parent
commit
5541792649
2 changed files with 2 additions and 3 deletions
  1. 0 1
      go.mod
  2. 2 2
      services/speech_recognition.go

+ 0 - 1
go.mod

@@ -113,7 +113,6 @@ require (
 	github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/image v0.15.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect

+ 2 - 2
services/speech_recognition.go

@@ -326,7 +326,7 @@ func MoveSpeechMenu(req speech_recognition.SpeechRecognitionMenuMoveReq) (err er
 		{
 			cond := fmt.Sprintf(` AND %s = ? AND %s = ? AND %s <> ?`, speech_recognition.SpeechRecognitionMenuCols.MenuName, speech_recognition.SpeechRecognitionMenuCols.ParentId, speech_recognition.SpeechRecognitionMenuCols.SpeechRecognitionMenuId)
 			pars := make([]interface{}, 0)
-			pars = append(pars, parentMenuId, speechMenu.MenuName, menuId)
+			pars = append(pars, speechMenu.MenuName, parentMenuId, menuId)
 			exists, e := menuOb.GetItemByCondition(cond, pars, "")
 			if e != nil && e.Error() != utils.ErrNoRow() {
 				errMsg = "移动失败"
@@ -827,7 +827,7 @@ func MoveSpeechTagMenu(req speech_recognition.SpeechRecognitionTagMenuMoveReq) (
 		{
 			cond := fmt.Sprintf(` AND %s = ? AND %s = ? AND %s <> ?`, speech_recognition.SpeechRecognitionTagMenuCols.MenuName, speech_recognition.SpeechRecognitionTagMenuCols.ParentId, speech_recognition.SpeechRecognitionTagMenuCols.SpeechRecognitionTagMenuId)
 			pars := make([]interface{}, 0)
-			pars = append(pars, parentMenuId, tagMenu.MenuName, menuId)
+			pars = append(pars, tagMenu.MenuName, parentMenuId, menuId)
 			exists, e := menuOb.GetItemByCondition(cond, pars, "")
 			if e != nil && e.Error() != utils.ErrNoRow() {
 				errMsg = "移动失败"