|
@@ -9,6 +9,7 @@ import (
|
|
|
"jyBXCore/rpc/model/mysql"
|
|
|
"jyBXCore/rpc/type/bxcore"
|
|
|
"jyBXCore/rpc/util"
|
|
|
+ "log"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
@@ -19,8 +20,8 @@ func ParticipateList(in *bxcore.ParticipateListReq) (*bxcore.ParticipateListRes,
|
|
|
defer MC.Catch()
|
|
|
res := &bxcore.ParticipateListRes{Data: &bxcore.ParticipateData{}}
|
|
|
b, entRoleId := util.IsAllowedParticipate(in.AppId, in.UserId, in.NewUserId, in.AccountId, in.EntAccountId, in.EntId, in.EntUserId, in.PositionId, in.PositionType)
|
|
|
- if !b {
|
|
|
- res.ErrCode = -1
|
|
|
+ if !b || (in.Identity == "ent" && entRoleId == 0) {
|
|
|
+ res.ErrCode = 0
|
|
|
res.ErrMsg = "没有权限"
|
|
|
return res, nil
|
|
|
}
|
|
@@ -36,6 +37,7 @@ func ParticipateList(in *bxcore.ParticipateListReq) (*bxcore.ParticipateListRes,
|
|
|
if in.PageSize < 1 {
|
|
|
in.PageSize = 10
|
|
|
}
|
|
|
+ log.Println(in.PageNum, "------", in.PageSize)
|
|
|
switch in.Identity {
|
|
|
case "mine": //员工|个人列表
|
|
|
r, e := mysql.SingleParticipateList(in, mysql.ParticipateListSql(in))
|