Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-user into dev

@@ -456,7 +456,7 @@ func (userService *UserService) ListUser(listUserQuery *query.ListUserQuery) (in
 	} else {
 	} else {
 		userRepository = value
 		userRepository = value
 	}
 	}
-	_, company, _ := factory.FastPgCompany(transactionContext, listUserQuery.OperateInfo.GetCompanyId(listUserQuery.CompanyId))
+	var company *domain.Company
 	var dtoUsers []*dto.UserDto
 	var dtoUsers []*dto.UserDto
 	queryOptions := utils.ObjectToMap(listUserQuery)
 	queryOptions := utils.ObjectToMap(listUserQuery)
 	if len(listUserQuery.Phone) > 0 {
 	if len(listUserQuery.Phone) > 0 {