|
@@ -1,7 +1,6 @@
|
|
package outServer
|
|
package outServer
|
|
|
|
|
|
import (
|
|
import (
|
|
- "app.yhyue.com/moapp/jybase/common"
|
|
|
|
"bytes"
|
|
"bytes"
|
|
"fmt"
|
|
"fmt"
|
|
"io"
|
|
"io"
|
|
@@ -12,7 +11,6 @@ import (
|
|
"regexp"
|
|
"regexp"
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
- . "app.yhyue.com/moapp/jypkg/ent/entity"
|
|
|
|
"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
|
|
"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
|
|
"github.com/gogf/gf/v2/net/ghttp"
|
|
"github.com/gogf/gf/v2/net/ghttp"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
@@ -189,7 +187,7 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
|
|
}
|
|
}
|
|
//role//角色,0:个人版1:企业版-企业管理员2:企业版-部门管理员3:企业版-员工
|
|
//role//角色,0:个人版1:企业版-企业管理员2:企业版-部门管理员3:企业版-员工
|
|
//entDeptId//部门id
|
|
//entDeptId//部门id
|
|
- currentUser := VarCurrentUser.EntInfo(common.IntAll(ctx.Sess.EntId), common.IntAll(ctx.Sess.EntUserId))
|
|
|
|
|
|
+ /*currentUser := VarCurrentUser.EntInfo(common.IntAll(ctx.Sess.EntId), common.IntAll(ctx.Sess.EntUserId))
|
|
role := 0
|
|
role := 0
|
|
deptId := 0
|
|
deptId := 0
|
|
if ctx.Sess.PositionType == 1 {
|
|
if ctx.Sess.PositionType == 1 {
|
|
@@ -203,7 +201,7 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
|
|
deptId = currentUser.Dept.Id
|
|
deptId = currentUser.Dept.Id
|
|
}
|
|
}
|
|
replaceMap["jyRole"] = role
|
|
replaceMap["jyRole"] = role
|
|
- replaceMap["jyEntDeptId"] = deptId
|
|
|
|
|
|
+ replaceMap["jyEntDeptId"] = deptId*/
|
|
if r.Request.Method == http.MethodPost {
|
|
if r.Request.Method == http.MethodPost {
|
|
bodyBytes, err := io.ReadAll(r.Request.Body)
|
|
bodyBytes, err := io.ReadAll(r.Request.Body)
|
|
if err != nil {
|
|
if err != nil {
|