bug 修复

@@ -164,10 +164,14 @@ func (srv BusinessBonusService) GetBusinessBonus(queryOption query.GetBusinessBo
 		"dividendsReceivable":  bonusData.Bonus,
 		"dividendsReceivable":  bonusData.Bonus,
 		"receiveDividends":     bonusData.BonusHas,
 		"receiveDividends":     bonusData.BonusHas,
 		"uncollectedDividends": bonusData.BonusNot,
 		"uncollectedDividends": bonusData.BonusNot,
-		"updateTime":           bonusData.UpdateAt.Format("2006-01-02 15:04:05"),
+		"updateTime":           "",
 		"stateOfPayment":       bonusData.BonusStatus,
 		"stateOfPayment":       bonusData.BonusStatus,
 		"stateOfPaymentName":   domain.DescribeBusinessBonusStatus(bonusData.BonusStatus),
 		"stateOfPaymentName":   domain.DescribeBusinessBonusStatus(bonusData.BonusStatus),
 		"id":                   bonusData.Id,
 		"id":                   bonusData.Id,
 	}
 	}
+	if !bonusData.UpdateAt.IsZero() {
+		returnData["updateTime"] = bonusData.UpdateAt.Format("2006-01-02 15:04:05")
+	}
+
 	return returnData, nil
 	return returnData, nil
 }
 }

@@ -134,7 +134,8 @@ func (service SyncCompanyService) addCompany(data CompanytData) error {
 		Remarks:        data.User.Remarks,
 		Remarks:        data.User.Remarks,
 		ChargeStatus:   data.User.ChargeStatus,
 		ChargeStatus:   data.User.ChargeStatus,
 		Permission:     []domain.AdminPermissionBase{}, //初始化权限
 		Permission:     []domain.AdminPermissionBase{}, //初始化权限
-		AccessPartners: []domain.Partner{},             //默认初始化
+		AccessPartners: []domain.Partner{},
+		AdminType:      data.User.AdminType,
 	}
 	}
 	err = userRespository.Add(&user)
 	err = userRespository.Add(&user)
 	if err != nil {
 	if err != nil {

@@ -270,7 +270,7 @@ func (service UsersService) GetUserList(queryOption query.UserListQuery) (int, [
 		Limit:         queryOption.Limit,
 		Limit:         queryOption.Limit,
 		CompanyId:     queryOption.CompanyId,
 		CompanyId:     queryOption.CompanyId,
 	})
 	})
-	var permissionQuery domain.PermissionFindOption
+	var permissionQuery = domain.PermissionFindOption{}
 	permissionList, err = permissionRepository.Find(permissionQuery)
 	permissionList, err = permissionRepository.Find(permissionQuery)
 	if err != nil {
 	if err != nil {
 		return 0, nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
 		return 0, nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
@@ -285,6 +285,9 @@ func (service UsersService) buildGetUserList(usersData []domain.Users, permissio
 	result := make([]map[string]interface{}, 0, len(usersData))
 	result := make([]map[string]interface{}, 0, len(usersData))
 	permissionMap := map[int64]domain.AdminPermission{}
 	permissionMap := map[int64]domain.AdminPermission{}
 	for i := range permissionData {
 	for i := range permissionData {
+		if permissionData[i].ParentId > 0 {
+			continue
+		}
 		permissionMap[permissionData[i].Id] = permissionData[i]
 		permissionMap[permissionData[i].Id] = permissionData[i]
 	}
 	}
 	for i := range usersData {
 	for i := range usersData {

@@ -20,7 +20,7 @@ const (
 
 
 func DescribeBusinessBonusStatus(i int8) string {
 func DescribeBusinessBonusStatus(i int8) string {
 	m := map[int8]string{
 	m := map[int8]string{
-		BUSINESS_BONUS_WAIT_PAY: "待支付分红",
+		BUSINESS_BONUS_WAIT_PAY: "等待支付分红",
 		BUSINESS_BONUS_HAS_PAY:  "已支付分红",
 		BUSINESS_BONUS_HAS_PAY:  "已支付分红",
 	}
 	}
 	if v, ok := m[i]; ok {
 	if v, ok := m[i]; ok {

@@ -5,7 +5,7 @@ type PartnerCategory struct {
 	// 唯一标识
 	// 唯一标识
 	Id int64 `json:"id"`
 	Id int64 `json:"id"`
 	// 名称
 	// 名称
-	Name string `json:"name"`
+	Name string `json:"name,omitempty"`
 }
 }
 
 
 type PartnerCategoryFindQuery struct {
 type PartnerCategoryFindQuery struct {

@@ -33,7 +33,7 @@ type PartnerInfo struct {
 	// 合伙类别 （1.研发合伙人 2.业务合伙人  3.事业）
 	// 合伙类别 （1.研发合伙人 2.业务合伙人  3.事业）
 	PartnerCategory int `pg:",default:1"` //partner_category
 	PartnerCategory int `pg:",default:1"` //partner_category
 	//合伙类别
 	//合伙类别
-	PartnerCategoryInfos []struct{ Id int64 }
+	PartnerCategoryInfos []domain.PartnerCategory
 	//公司id
 	//公司id
 	CompanyId int64
 	CompanyId int64
 }
 }

@@ -57,12 +57,11 @@ func (repository *PartnerInfoRepository) Save(dm *domain.PartnerInfo) error {
 		tx  = repository.transactionContext.PgTx
 		tx  = repository.transactionContext.PgTx
 	)
 	)
 
 
-	categorys := []struct{ Id int64 }{}
+	categorys := []domain.PartnerCategory{}
 	for _, v := range dm.PartnerCategoryInfos {
 	for _, v := range dm.PartnerCategoryInfos {
-		temp := struct{ Id int64 }{
+		categorys = append(categorys, domain.PartnerCategory{
 			Id: v.Id,
 			Id: v.Id,
-		}
-		categorys = append(categorys, temp)
+		})
 	}
 	}
 	m := &models.PartnerInfo{
 	m := &models.PartnerInfo{
 		Id:                   dm.Partner.Id,
 		Id:                   dm.Partner.Id,
@@ -129,7 +128,7 @@ func (repository *PartnerInfoRepository) Find(queryOption domain.PartnerFindQuer
 	if len(queryOption.PartnerCategory) > 0 {
 	if len(queryOption.PartnerCategory) > 0 {
 		query = query.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 		query = query.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 			for _, value := range queryOption.PartnerCategory {
 			for _, value := range queryOption.PartnerCategory {
-				q = q.WhereOr(`partner_category_infos@> '{"id":?}'`, value)
+				q = q.WhereOr(`partner_category_infos@> '[{"id":?}]'`, value)
 			}
 			}
 			return q, nil
 			return q, nil
 		})
 		})

@@ -52,6 +52,7 @@ func (c *BusinessBonusController) ListBusinessBonus() {
 		CompanyId: companyId,
 		CompanyId: companyId,
 		Limit:     param.PageSize,
 		Limit:     param.PageSize,
 		Offset:    param.PageSize * (param.PageNumber - 1),
 		Offset:    param.PageSize * (param.PageNumber - 1),
+		PartnerId: param.Partner,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		c.ResponseError(err)
 		c.ResponseError(err)