diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php index 1c884f6..e57ae5f 100644 --- a/app/admin/lists/user/UserLists.php +++ b/app/admin/lists/user/UserLists.php @@ -54,7 +54,9 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface ->limit($this->limitOffset, $this->limitLength) ->field($field) ->order('id desc') - ->select()->toArray(); + ->select()->each(function($data){ + $data['sex_text'] = $data->sex_text; + })->toArray(); foreach ($lists as &$item) { $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']); } diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index dfaf9c0..b6a91c8 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -26,7 +26,7 @@ class UserValidate extends BaseValidate 'password' => 'require', 'mobile' => 'require|mobile', 'is_disable' => 'in:0,1', - 'sex' => 'in:i,2', + 'sex' => 'in:1,2', 'user_money' => 'float' ]; @@ -56,7 +56,7 @@ class UserValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['real_name','nickname','account','password','mobile']); + return $this->remove('id',true); } @@ -68,7 +68,7 @@ class UserValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','real_name','nickname','account','password','mobile'])->remove('password','require'); + return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex','user_money'])->remove('password','require'); } diff --git a/app/api/lists/operation/OpurchaseGoodsOfferList.php b/app/api/lists/operation/OpurchaseGoodsOfferList.php index 4ba5d7d..8943b56 100644 --- a/app/api/lists/operation/OpurchaseGoodsOfferList.php +++ b/app/api/lists/operation/OpurchaseGoodsOfferList.php @@ -55,8 +55,10 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI ->order(['id' => 'desc']) ->select()->each(function($data){ $data['is_adopt_text'] = $data->is_adopt_text; - $unit = Unit::where('id',$data['goods']['unit'])->findOrEmpty(); - $data['goods']['unit_name'] = !$unit->isEmpty() ? $unit->name : ''; + if(!empty($data['goods'])){ + $unit = Unit::where('id',$data['goods']['unit'])->findOrEmpty(); + $data['goods']['unit_name'] = !$unit->isEmpty() ? $unit['name'] : ''; + } }) ->toArray(); } diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index c54b059..5ba4141 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -120,9 +120,9 @@ class User extends BaseModel * @author 乔峰 * @date 2022/9/7 15:15 */ - public function getSexAttr($value, $data) + public function getSexTextAttr($value, $data) { - return UserEnum::getSexDesc($value); + return UserEnum::getSexDesc($data['sex']); }