Browse Source

feat:更新

wangshan 2 years ago
parent
commit
eb3ecff421
2 changed files with 12 additions and 2 deletions
  1. 9 2
      entity/workDesktop.go
  2. 3 0
      service/workDesktop.go

+ 9 - 2
entity/workDesktop.go

@@ -233,8 +233,15 @@ const (
 // CommonlyUpdate 更新常用功能
 // CommonlyUpdate 更新常用功能
 func CommonlyUpdate(in *pb.WorkDesktopComprehensiveReq) (B bool, M string) {
 func CommonlyUpdate(in *pb.WorkDesktopComprehensiveReq) (B bool, M string) {
 	//事务  1:查; 2: 存;3: 删;
 	//事务  1:查; 2: 存;3: 删;
-	var ids []string
-	for mk, mid := range strings.Split(in.MenuIds, ",") {
+	var (
+		ids []string
+		mk  int
+	)
+	for _, mid := range strings.Split(in.MenuIds, ",") {
+		if mid == "" {
+			continue
+		}
+		mk++
 		//常用功能数量限制
 		//常用功能数量限制
 		if in.CommonlySize > 0 && mk >= int(in.CommonlySize) {
 		if in.CommonlySize > 0 && mk >= int(in.CommonlySize) {
 			break
 			break

+ 3 - 0
service/workDesktop.go

@@ -40,6 +40,9 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
 			if MC.ObjToString(eData["value"]) != "" {
 			if MC.ObjToString(eData["value"]) != "" {
 				for _, pv := range strings.Split(MC.ObjToString(eData["value"]), ",") {
 				for _, pv := range strings.Split(MC.ObjToString(eData["value"]), ",") {
 					//params = append(params, "?")
 					//params = append(params, "?")
+					if pv == "" {
+						continue
+					}
 					pIds = append(pIds, pv)
 					pIds = append(pIds, pv)
 				}
 				}
 			}
 			}