Merge branch 'master' of https://jygit.jydev.jianyu360.cn/moapp/jypkg

go.mod

@@ -9,7 +9,7 @@ require (
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/robfig/cron v1.2.0
 	github.com/tealeg/xlsx v1.0.5

go.sum

@@ -15,8 +15,8 @@ bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f7
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13/go.mod h1:vDEKni2rnCraKgKnnCEIwsFmO92GxnpfKmNQ+83wKP0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

identity/identity.go

@@ -21,6 +21,8 @@ type IdentityInfo struct {
 	EntId        int64  //企业id
 	EntUserId    int64  //企业员工id
 	EntUserName  string //企业员工姓名
+	EntRole      int64  //管理员角色
+	EntNicheDis  int64  //商机分配角色
 }
 
 func NewIdentityInfo(i *pb.Identity) *IdentityInfo {
@@ -35,6 +37,8 @@ func NewIdentityInfo(i *pb.Identity) *IdentityInfo {
 		EntId:        i.EntId,
 		EntUserId:    i.EntUserId,
 		EntUserName:  i.EntUserName,
+		EntRole:      i.EntRole,
+		EntNicheDis:  i.EntNicheDis,
 	}
 }
 
@@ -63,6 +67,8 @@ func (i *IdentityInfo) Switch(sess *httpsession.Session, mgo *MongodbSim) bool {
 		m["frameworkEntName"] = i.Name
 		m["userId"] = strconv.FormatInt(i.PositionId, 10)
 		m["entAccountId"] = i.EntAccountId
+		m["entRole"] = i.EntRole
+		m["entNicheDis"] = i.EntNicheDis
 		ok = true
 	}
 	sess.SetMultiple(m)