Просмотр исходного кода

店舗ログインユーザー一覧にほかの顧客ユーザーが混じっているのを修正

develop
sosuke.iwabuchi 1 год назад
Родитель
Сommit
d9131f4de1
2 измененных файлов: 7 добавлений и 0 удалений
  1. +3
    -0
      app/Http/Controllers/Web/LoginUser/ShopListController.php
  2. +4
    -0
      app/Repositories/LoginUserRepository.php

+ 3
- 0
app/Http/Controllers/Web/LoginUser/ShopListController.php Просмотреть файл

@@ -31,9 +31,12 @@ class ShopListController extends WebController
{ {
$param = $this->param; $param = $this->param;


$customerCode = $this->sessionUser->customerCode();

$list = $this->repository->get([ $list = $this->repository->get([
...$param->toArray(), ...$param->toArray(),
LoginUserRepository::CONDITION_ROLE => UserRole::SHOP->value, LoginUserRepository::CONDITION_ROLE => UserRole::SHOP->value,
LoginUserRepository::CONDITION_CUSTOMER_CODE => $customerCode,
]); ]);
$res = [ $res = [
"list" => $list, "list" => $list,


+ 4
- 0
app/Repositories/LoginUserRepository.php Просмотреть файл

@@ -17,6 +17,7 @@ class LoginUserRepository extends BaseRepository
const CONDITION_NAME = 'name'; const CONDITION_NAME = 'name';
const CONDITION_ROLE = 'role'; const CONDITION_ROLE = 'role';
const CONDITION_EMAIL = 'email'; const CONDITION_EMAIL = 'email';
const CONDITION_CUSTOMER_CODE = 'customer_code';


const TABLE_USER = "user"; const TABLE_USER = "user";
const TABLE_CUSTOMER = "customer"; const TABLE_CUSTOMER = "customer";
@@ -43,6 +44,9 @@ class LoginUserRepository extends BaseRepository
// ID // ID
$this->where($table, $condition, static::CONDITION_ID, $this->makeColumnName([static::TABLE_USER, User::COL_NAME_ID])); $this->where($table, $condition, static::CONDITION_ID, $this->makeColumnName([static::TABLE_USER, User::COL_NAME_ID]));


// 顧客コード
$this->where($table, $condition, static::CONDITION_CUSTOMER_CODE, $this->makeColumnName([static::TABLE_USER, User::COL_NAME_CUSTOMER_CODE]));

// 名前 // 名前
$name = data_get($condition, static::CONDITION_NAME); $name = data_get($condition, static::CONDITION_NAME);
if ($name) { if ($name) {


Загрузка…
Отмена
Сохранить