|
|
@@ -79,8 +79,8 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
|
|
|
//会出现 用户设置常用功能，此功能下线，用户设置依然保存的有此功能 查询不能加 AND status = 0
|
|
|
var menuSql = fmt.Sprintf(`SELECT * from %s WHERE (id IN (%s) OR (parentid IN (%s) AND status = 0)) %s ORDER BY FIELD(id , %s);`, entity.ConfigJson.WorkTableInside, strings.Join(pIds, ","), strings.Join(pIds, ","), positionType, strings.Join(pIds, ","))
|
|
|
//外网访问
|
|
|
- if entity.ConfigJson.WorkTableInside != entity.ConfigJson.WorkTableOut || !in.IntranetBool {
|
|
|
- menuSql = fmt.Sprintf(`SELECT * from %s WHERE （id IN (%s) OR (parentid IN (%s) AND status = 0)) %s`, entity.ConfigJson.WorkTableOut, strings.Join(pIds, ","), strings.Join(pIds, ","), positionType)
|
|
|
+ if entity.ConfigJson.WorkTableInside != entity.ConfigJson.WorkTableOut && !in.IntranetBool {
|
|
|
+ menuSql = fmt.Sprintf(`SELECT * from %s WHERE (id IN (%s) OR (parentid IN (%s) AND status = 0)) %s ORDER BY FIELD(id , %s);`, entity.ConfigJson.WorkTableOut, strings.Join(pIds, ","), strings.Join(pIds, ","), positionType, strings.Join(pIds, ","))
|
|
|
}
|
|
|
menuData := entity.BaseMysql.SelectBySql(menuSql)
|
|
|
if menuData != nil && len(*menuData) > 0 {
|
