Skip to content

Commit

Permalink
refactor: 业务里的isset替换为 !empty
Browse files Browse the repository at this point in the history
  • Loading branch information
@kanyxmo
kanyxmo committed Jul 7, 2023
1 parent 6e03f7f commit f724295
Show file tree
Hide file tree
Showing 22 changed files with 91 additions and 91 deletions.
6 changes: 3 additions & 3 deletions app/Setting/Mapper/SettingConfigMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ public function save(array $data): int
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['group_id']) && !empty($params['group_id'])) {
if (!empty($params['group_id'])) {
$query->where('group_id', $params['group_id']);
}
if (isset($params['name']) && !empty($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', $params['name']);
}
if (isset($params['key']) && !empty($params['key'])) {
if (!empty($params['key'])) {
$query->where('key', 'like', '%'.$params['key'].'%');
}
return $query;
Expand Down
8 changes: 4 additions & 4 deletions app/Setting/Mapper/SettingCrontabMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ public function delete(array $ids): bool
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', 'like', '%'.$params['name'].'%');
}
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}
if (isset($params['type'])) {
if (!empty($params['type'])) {
$query->where('type', $params['type']);
}
if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
Expand Down
2 changes: 1 addition & 1 deletion app/Setting/Mapper/SettingDatasourceMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function handleSearch(Builder $query, array $params): Builder
{

// 数据源名称
if (isset($params['source_name']) && $params['source_name'] !== '') {
if (!empty($params['source_name'])) {
$query->where('source_name', 'like', '%'.$params['source_name'].'%');
}

Expand Down
4 changes: 2 additions & 2 deletions app/Setting/Mapper/SettingGenerateTablesMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public function delete(array $ids): bool
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['table_name'])) {
if (!empty($params['table_name'])) {
$query->where('table_name', 'like', '%'.$params['table_name'].'%');
}
if (isset($params['minDate']) && isset($params['maxDate'])) {
if (!empty($params['minDate']) && !empty($params['maxDate'])) {
$query->whereBetween(
'created_at',
[$params['minDate'] . ' 00:00:00', $params['maxDate'] . ' 23:59:59']
Expand Down
12 changes: 6 additions & 6 deletions app/System/Mapper/SystemApiColumnMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@ public function assignModel()
public function handleSearch(Builder $query, array $params): Builder
{
// 接口ID
if (isset($params['api_id'])) {
if (!empty($params['api_id'])) {
$query->where('api_id', '=', $params['api_id']);
}

// 字段类型
if (isset($params['type'])) {
if (!empty($params['type'])) {
$query->where('type', '=', $params['type']);
}

// 字段名称
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', '=', $params['name']);
}

// 数据类型
if (isset($params['data_type'])) {
if (!empty($params['data_type'])) {
$query->where('data_type', '=', $params['data_type']);
}

// 是否必填 1 非必填 2 必填
if (isset($params['is_required'])) {
if (!empty($params['is_required'])) {
$query->where('is_required', '=', $params['is_required']);
}

// 状态 (1正常 2停用)
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', '=', $params['status']);
}
return $query;
Expand Down
6 changes: 3 additions & 3 deletions app/System/Mapper/SystemApiGroupMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ public function assignModel()
public function handleSearch(Builder $query, array $params): Builder
{
// 应用组名称
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', '=', $params['name']);
}

// 状态
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', '=', $params['status']);
}

// 关联查询api列表
if (isset($params['getApiList']) && $params['getApiList'] == true) {
if (!empty($params['getApiList']) && $params['getApiList'] == true) {
$query->with(['apis' => function($query) {
$query->where('status', SystemApi::ENABLE)->select(['id', 'group_id', 'name', 'access_name']);
}]);
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemApiLogMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['api_name'])) {
if (!empty($params['api_name'])) {
$query->where('api_name', 'like', '%'.$params['api_name'].'%');
}
if (isset($params['ip'])) {
if (!empty($params['ip'])) {
$query->where('ip', 'like', '%'.$params['ip'].'%');
}
if (isset($params['access_name'])) {
if (!empty($params['access_name'])) {
$query->where('access_name', 'like', '%'.$params['access_name'].'%');
}
if (isset($params['access_time']) && is_array($params['access_time']) && count($params['access_time']) == 2) {
if (!empty($params['access_time']) && is_array($params['access_time']) && count($params['access_time']) == 2) {
$query->whereBetween(
'access_time',
[ $params['access_time'][0] . ' 00:00:00', $params['access_time'][1] . ' 23:59:59' ]
Expand Down
4 changes: 2 additions & 2 deletions app/System/Mapper/SystemAppGroupMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public function assignModel()
public function handleSearch(Builder $query, array $params): Builder
{
// 应用组名称
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', '=', $params['name']);
}

// 状态
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', '=', $params['status']);
}
return $query;
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemAppMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['app_name'])) {
if (!empty($params['app_name'])) {
$query->where('app_name', $params['app_name']);
}

if (isset($params['app_id'])) {
if (!empty($params['app_id'])) {
$query->where('app_id', $params['app_id']);
}

if (isset($params['group_id'])) {
if (!empty($params['group_id'])) {
$query->where('group_id', $params['group_id']);
}

if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}
return $query;
Expand Down
10 changes: 5 additions & 5 deletions app/System/Mapper/SystemDeptMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,23 @@ public function checkChildrenExists(int $id): bool
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}

if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', 'like', '%'.$params['name'].'%');
}

if (isset($params['leader'])) {
if (!empty($params['leader'])) {
$query->where('leader', $params['leader']);
}

if (isset($params['phone'])) {
if (!empty($params['phone'])) {
$query->where('phone', $params['phone']);
}

if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
Expand Down
10 changes: 5 additions & 5 deletions app/System/Mapper/SystemDictDataMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['type_id'])) {
if (!empty($params['type_id'])) {
$query->where('type_id', $params['type_id']);
}
if (isset($params['code'])) {
if (!empty($params['code'])) {
$query->where('code', $params['code']);
}
if (isset($params['value'])) {
if (!empty($params['value'])) {
$query->where('value', 'like', '%'.$params['value'].'%');
}
if (isset($params['label'])) {
if (!empty($params['label'])) {
$query->where('label', 'like', '%'.$params['label'].'%');
}
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}

Expand Down
6 changes: 3 additions & 3 deletions app/System/Mapper/SystemDictTypeMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ public function realDelete(array $ids): bool
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['code'])) {
if (!empty($params['code'])) {
$query->where('code', 'like', '%'.$params['code'].'%');
}
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', 'like', '%'.$params['name'].'%');
}
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}
return $query;
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemLoginLogMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['ip'])) {
if (!empty($params['ip'])) {
$query->where('ip', $params['ip']);
}

if (isset($params['username'])) {
if (!empty($params['username'])) {
$query->where('username', 'like', '%'.$params['username'].'%');
}

if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}

if (isset($params['login_time']) && is_array($params['login_time']) && count($params['login_time']) == 2) {
if (!empty($params['login_time']) && is_array($params['login_time']) && count($params['login_time']) == 2) {
$query->whereBetween(
'login_time',
[ $params['login_time'][0] . ' 00:00:00', $params['login_time'][1] . ' 23:59:59' ]
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemMenuMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,22 +214,22 @@ public function checkChildrenExists(int $id): bool
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}

if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', 'like', '%'.$params['name'].'%');
}

if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
);
}

if (isset($params['noButton']) && $params['noButton'] === true) {
if (!empty($params['noButton']) && $params['noButton'] === true) {
$query->where('type', '<>', SystemMenu::BUTTON);
}
return $query;
Expand Down
6 changes: 3 additions & 3 deletions app/System/Mapper/SystemNoticeMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['title'])) {
if (!empty($params['title'])) {
$query->where('title', '=', $params['title']);
}

if (isset($params['type'])) {
if (!empty($params['type'])) {
$query->where('type', '=', $params['type']);
}

if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemOperLogMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['ip'])) {
if (!empty($params['ip'])) {
$query->where('ip', $params['ip']);
}
if (isset($params['service_name'])) {
if (!empty($params['service_name'])) {
$query->where('service_name', 'like', '%'.$params['service_name'].'%');
}
if (isset($params['username'])) {
if (!empty($params['username'])) {
$query->where('username', 'like', '%'.$params['username'].'%');
}
if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
Expand Down
8 changes: 4 additions & 4 deletions app/System/Mapper/SystemPostMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ public function assignModel()
*/
public function handleSearch(Builder $query, array $params): Builder
{
if (isset($params['name'])) {
if (!empty($params['name'])) {
$query->where('name', 'like', '%'.$params['name'].'%');
}
if (isset($params['code'])) {
if (!empty($params['code'])) {
$query->where('code', $params['code']);
}
if (isset($params['status'])) {
if (!empty($params['status'])) {
$query->where('status', $params['status']);
}
if (isset($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
if (!empty($params['created_at']) && is_array($params['created_at']) && count($params['created_at']) == 2) {
$query->whereBetween(
'created_at',
[ $params['created_at'][0] . ' 00:00:00', $params['created_at'][1] . ' 23:59:59' ]
Expand Down
10 changes: 5 additions & 5 deletions app/System/Mapper/SystemQueueLogMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ public function assignModel()
public function handleSearch(Builder $query, array $params): Builder
{
// 交换机名称
if (isset($params['exchange_name'])) {
if (!empty($params['exchange_name'])) {
$query->where('exchange_name', '=', $params['exchange_name']);
}

// 路由名称
if (isset($params['routing_key_name'])) {
if (!empty($params['routing_key_name'])) {
$query->where('routing_key_name', '=', $params['routing_key_name']);
}

// 队列名称
if (isset($params['queue_name'])) {
if (!empty($params['queue_name'])) {
$query->where('queue_name', '=', $params['queue_name']);
}

// 生产状态 0:未生产 1:生产中 2:生产成功 3:生产失败 4:生产重复
if (isset($params['produce_status'])) {
if (!empty($params['produce_status'])) {
$query->where('produce_status', '=', $params['produce_status']);
}

// 消费状态 0:未消费 1:消费中 2:消费成功 3:消费失败 4:消费重复
if (isset($params['consume_status'])) {
if (!empty($params['consume_status'])) {
$query->where('consume_status', '=', $params['consume_status']);
}

Expand Down
Loading

0 comments on commit f724295

Please sign in to comment.