feat：优化项目信息

app/api/enterprise/controller/account/login.go

@@ -79,7 +79,7 @@ func loginForSmsCaptcha(params *LoginParams, local string) (*InstanceLoginParams
 	}
 RETURNS:
 	return &InstanceLoginParams{
-		UID: mUserInstance.UUID, TenantID: mUserManage.TenantID, ManageUID: mUserManage.UUID,
+		UID: mUserInstance.UUID, ManageUID: mUserManage.UUID,
 		Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
 		Identity: mUserInstance.Identity, SelectIdentity: mUserManage.Identity,
 		Status: mUserInstance.Status,
@@ -111,7 +111,7 @@ func loginForPassword(params *LoginParams, local string) (*InstanceLoginParams,
 		return nil, err
 	}
 	return &InstanceLoginParams{
-		UID: mUserInstance.UUID, TenantID: mUserManage.TenantID, ManageUID: mUserManage.UUID,
+		UID: mUserInstance.UUID, ManageUID: mUserManage.UUID,
 		Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
 		Identity: mUserInstance.Identity, SelectIdentity: mUserManage.Identity,
 		Status: mUserInstance.Status,

app/api/enterprise/controller/technology/paper.go

@@ -36,7 +36,6 @@ func (c *Paper) List(title string, page, pageSize int) (*controller.ReturnPages,
 	mTechnologyPaper := model.NewTechnologyPaper()
 
 	where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
-		Where: model2.NewWhere("tenant_id", c.TenantID),
 		Order: model2.NewOrder("id", model2.OrderModeToDesc),
 	}, &model2.ModelWhereOrder{
 		Where: model2.NewWhere("local", c.local),

app/api/enterprise/controller/user/consume.go

@@ -0,0 +1,60 @@
+package user
+
+import (
+	"SciencesServer/app/api/enterprise/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+)
+
+// Consume 消耗日志
+type Consume struct {
+	*session.Enterprise
+	local string
+}
+
+type ConsumeHandle func(session *session.Enterprise, local string) *Consume
+
+type (
+	ConsumeInfo struct {
+		ID string `json:"id"`
+		*model2.UserConsume
+	}
+)
+
+// List 列表信息
+func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, error) {
+	mUserConsume := model.NewUserConsume()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("uid", c.UID),
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+	}
+	out := make([]*model2.UserConsume, 0)
+
+	var count int64
+
+	if err := model2.Pages(mUserConsume.UserConsume, &out, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	list := make([]*ConsumeInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &ConsumeInfo{
+			ID:          v.GetEncodeID(),
+			UserConsume: v,
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+func NewConsume() ConsumeHandle {
+	return func(session *session.Enterprise, local string) *Consume {
+		return &Consume{
+			Enterprise: session,
+			local:      local,
+		}
+	}
+}

app/api/enterprise/controller/user/instance.go

@@ -99,7 +99,7 @@ func (c *Instance) SwitchIdentity(identity int) error {
 	if c.SelectIdentity == identity {
 		return nil
 	}
-	c.TenantID, c.ManageUID = 0, 0
+	c.ManageUID = 0
 	// 已存在相应的身份，更新最后
 	if c.Identity&identity > 0 {
 		mUserManage := model.NewUserManage()
@@ -125,12 +125,12 @@ func (c *Instance) SwitchIdentity(identity int) error {
 				return err
 			}
 		}
-		c.TenantID = mUserManage.TenantID
 		c.ManageUID = mUserManage.UUID
+		c.SelectIdentity = identity
+		service.Publish(config2.EventForAccountLoginProduce, config2.RedisKeyForAccount, c.UIDToString(), c.Enterprise)
+		return nil
 	}
-	c.SelectIdentity = identity
-	service.Publish(config2.EventForAccountLoginProduce, config2.RedisKeyForAccount, c.UIDToString(), c.Enterprise)
-	return nil
+	return errors.New("操作错误，无效的身份信息")
 }
 
 func NewInstance() InstanceHandle {

app/api/enterprise/controller/user/settled.go

@@ -92,7 +92,6 @@ func (c *Settled) Expert(params *SettledParams, other *config.IdentityForExpert)
 	if err != nil {
 		return err
 	}
-	mManageExpert.TenantID = other.TenantID
 	mManageExpert.Area = model2.Area{
 		Province: params.Area.Province, City: params.Area.City, District: params.Area.District, Address: params.Area.Address,
 	}
@@ -156,7 +155,6 @@ func (c *Settled) Laboratory(params *SettledParams, other *config.IdentityForLab
 	if err != nil {
 		return err
 	}
-	mManageLaboratory.TenantID = other.TenantID
 	mManageLaboratory.Name = params.Name
 	mManageLaboratory.Code = params.Code
 	mManageLaboratory.Area = model2.Area{