Merge branch 'dev/v1.2.33_fu' of BaseService/userCenter into feature/v1.2.33

service/workDesktop.go

@@ -56,6 +56,7 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
 			if entity.ConfigJson.CommonlyIds != "" && len(strings.Split(entity.ConfigJson.CommonlyIds, ",")) > 0 {
 				// 判断用户身份
 				var ids []string
+				var oIds []string // 没有加密的id
 				var (
 					entId, _        = strconv.ParseInt(in.EntId, 10, 64)
 					newUserId, _    = strconv.ParseInt(in.NewUserId, 10, 64)
@@ -104,13 +105,13 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
 							}
 						}
 					}
-
+					oIds = append(oIds, v)
 					ids = append(ids, encrypt.SE.EncodeString(v))
 				}
 				in.MenuIds = strings.Join(ids, ",")
 				//初始化 常用功能
 				if b, _ := entity.CommonlyUpdate(in); b {
-					pIds = strings.Split(entity.ConfigJson.CommonlyIds, ",")
+					pIds = oIds
 				} else {
 					logx.Info("初始化常用功能异常")
 				}