wip:分配回收修改

rpc/internal/logic/entaccountgivenlogic.go

@@ -36,7 +36,7 @@ func (l *EntAccountGivenLogic) EntAccountGiven(in *resourcesCenter.EntOperateReq
 		waitBalance := &entity.Balance{} //等待分配的数量
 		orm := entity.Engine.NewSession()
 		_, err := orm.Table(AccountResources).Where("companyId=? AND resourceType=? AND empowerId=? AND number>0 AND endTime>= ? AND accountId like 'wait_%'", in.CompanyId, in.ResourceType, in.EmpowerId, time.Now().Format("2006-01-02")).OrderBy("id asc").Limit(1).Get(waitBalance)
-		if err != nil || waitBalance == nil {
+		if err != nil || waitBalance == nil || waitBalance.Id == 0 {
 			return entity.ErrorCode, "账户查询异常"
 		}
 		if err = orm.Begin(); err != nil {

rpc/internal/logic/entaccountrecoverylogic.go

@@ -43,7 +43,7 @@ func (l *EntAccountRecoveryLogic) EntAccountRecovery(in *resourcesCenter.EntOper
 
 		_, err = orm.Table(AccountResources).
 			Where("companyId=? AND resourceType=? AND number>0 AND endTime>= ? AND accountId = ?", in.CompanyId, in.ResourceType, time.Now().Format("2006-01-02"), in.OperateAccountId).Get(balance)
-		if err != nil || balance == nil {
+		if err != nil || balance == nil || balance.Id == 0 {
 			return entity.ErrorCode, "账户查询异常"
 		}
 		if err = orm.Begin(); err != nil {