作者 yangfu

fix:默认用户类型 ,用户搜索限制长度修改

@@ -80,6 +80,9 @@ func (dto *UserDto) LoadDto(user *domain.User, company *domain.Company) error { @@ -80,6 +80,9 @@ func (dto *UserDto) LoadDto(user *domain.User, company *domain.Company) error {
80 dto.UserInfo.IcCardNumber = user.Ext.IcCardNumber 80 dto.UserInfo.IcCardNumber = user.Ext.IcCardNumber
81 dto.UserInfo.EmployeeType = user.Ext.EmployeeType 81 dto.UserInfo.EmployeeType = user.Ext.EmployeeType
82 } 82 }
  83 + if dto.UserInfo.EmployeeType == 0 {
  84 + dto.UserInfo.EmployeeType = 1
  85 + }
83 if len(dto.UserRole) == 0 { 86 if len(dto.UserRole) == 0 {
84 dto.UserRole = make([]*domain.Role, 0) 87 dto.UserRole = make([]*domain.Role, 0)
85 } 88 }
@@ -231,7 +231,7 @@ func (repository *UserRepository) Find(queryOptions map[string]interface{}) (int @@ -231,7 +231,7 @@ func (repository *UserRepository) Find(queryOptions map[string]interface{}) (int
231 if v, ok := queryOptions["cooperationCompany"]; ok && len(v.(string)) > 0 { 231 if v, ok := queryOptions["cooperationCompany"]; ok && len(v.(string)) > 0 {
232 query.Where(fmt.Sprintf(`cooperation_info->>'cooperationCompany' like '%%%v%%'`, v)) 232 query.Where(fmt.Sprintf(`cooperation_info->>'cooperationCompany' like '%%%v%%'`, v))
233 } 233 }
234 - query.SetOffsetAndLimit(20) 234 + query.SetOffsetAndLimit(domain.MaxQueryRow)
235 query.SetOrderDirect("user_id", "DESC") 235 query.SetOrderDirect("user_id", "DESC")
236 if count, err := query.SelectAndCount(); err != nil { 236 if count, err := query.SelectAndCount(); err != nil {
237 return 0, users, err 237 return 0, users, err