Merge remote-tracking branch 'origin/master'

# Conflicts:
#	go.mod
#	go.sum

ent/entity/entity.go

@@ -92,7 +92,7 @@ func (c *CurrentUser) EntInfo(entId, entUserId int) *CurrentUser {
 			INNER JOIN entniche_department d on (c.dept_id=d.id) 
 			INNER JOIN entniche_department e on (e.ent_id=? and e.pid=0) 
 			left join entniche_power f on (f.ent_user_id=? and f.ent_id=? and f.status=1 and a.id=f.ent_user_id) 
-			left join entniche_wait_empower g on (g.ent_id=? and g.end_time>? and f.ent_id=g.ent_id) 
+			left join entniche_wait_empower g on (g.ent_id=? and g.end_time>? and f.wait_empower_id=g.id) 
 			order by a.id desc limit 1`, entUserId, entUserId, entId, entUserId, entId, entId, NowFormat(Date_Full_Layout))
 		if r != nil && len(*r) == 1 {
 			currentUser.User_name, _ = (*r)[0]["user_name"].(string)

middleground/middleground.go

@@ -0,0 +1,11 @@
+package middleground
+
+type Middleground struct {
+	UserCenter *userCenter
+}
+
+func NewMiddleground(hosts []string, key string) *Middleground {
+	return &Middleground{
+		UserCenter: newUserCenter(hosts, key),
+	}
+}

middleground/usercenter.go

@@ -0,0 +1,93 @@
+package middleground
+
+import (
+	"context"
+	"log"
+
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
+)
+
+type userCenter struct {
+	hosts []string
+	key   string
+}
+
+func newUserCenter(hosts []string, key string) *userCenter {
+	return &userCenter{
+		hosts: hosts,
+		key:   key,
+	}
+}
+
+func (u *userCenter) newClient() zrpc.Client {
+	client, err := zrpc.NewClient(zrpc.RpcClientConf{
+		Etcd: discov.EtcdConf{
+			Hosts: u.hosts,
+			Key:   u.key,
+		},
+	})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	return client
+}
+
+//获取身份列表
+func (u *userCenter) IdentityList(userId int64) []*pb.Identity {
+	client := u.newClient()
+	defer client.Conn().Close()
+	resp, err := usercenter.NewUserCenter(client).IdentityList(context.Background(), &pb.IdentityReq{
+		Id: userId,
+	})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	return resp.Identitys
+}
+
+//获取账号id获取个人身份信息
+func (u *userCenter) IdentityByUserId(userId int64) *pb.Identity {
+	client := u.newClient()
+	defer client.Conn().Close()
+	resp, err := usercenter.NewUserCenter(client).IdentityByUserId(context.Background(), &pb.IdentityReq{
+		Id: userId,
+	})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	return resp
+}
+
+//根据职位id获取身份信息
+func (u *userCenter) IdentityByPositionId(positionId int64) *pb.Identity {
+	client := u.newClient()
+	defer client.Conn().Close()
+	resp, err := usercenter.NewUserCenter(client).IdentityByPositionId(context.Background(), &pb.IdentityReq{
+		Id: positionId,
+	})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	return resp
+}
+
+//根据企业员工id获取身份信息
+func (u *userCenter) IdentityByEntUserId(entUserId int64) *pb.Identity {
+	client := u.newClient()
+	defer client.Conn().Close()
+	resp, err := usercenter.NewUserCenter(client).IdentityByEntUserId(context.Background(), &pb.IdentityReq{
+		Id: entUserId,
+	})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	return resp
+}