|
@@ -5,6 +5,7 @@ namespace app\admin\controller\member;
|
|
|
use app\admin\validate\member\RuleAddedValidate;
|
|
|
use app\admin\validate\member\RulePricingValidate;
|
|
|
use app\controller\Curd;
|
|
|
+use app\model\Member;
|
|
|
use app\model\MemberQuota;
|
|
|
use app\model\RuleAdded;
|
|
|
use app\model\RulePricing;
|
|
@@ -24,7 +25,22 @@ class QuotaController extends Curd
|
|
|
|
|
|
public function select(Request $request): Response
|
|
|
{
|
|
|
+ $keywords = $request->get('keywords', '');
|
|
|
+ $memberIds = [];
|
|
|
+ if (!empty($keywords)) {
|
|
|
+ $memberIds = Member::leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'member.member_id')
|
|
|
+ ->where('member.member_mobile', 'like', '%' . $keywords . '%')
|
|
|
+ ->orWhere('member_cert.member_cert_name', 'like', '%' . $keywords . '%')
|
|
|
+ ->pluck('member.member_id')->toArray();
|
|
|
+ if (empty($memberIds)) {
|
|
|
+ return json_success('', []);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
[$where, $format, $limit, $field, $order] = $this->selectInput($request);
|
|
|
+ if (!empty($memberIds)) {
|
|
|
+ $where['join_quota_member_id'] = ['in', $memberIds];
|
|
|
+ }
|
|
|
$order = $request->get('order', 'desc');
|
|
|
$field = $field ?? 'member_quota_addtimes';
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
@@ -40,7 +56,7 @@ class QuotaController extends Curd
|
|
|
'cert' => function ($query) {
|
|
|
$query->select('join_cert_member_id', 'member_cert_name');
|
|
|
},
|
|
|
- 'component'=>function($query){
|
|
|
+ 'component' => function ($query) {
|
|
|
$query->select('rule_added_component_id', 'rule_added_component_name');
|
|
|
}
|
|
|
]);
|