周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 65776db8af3da6f9b193ee8f146a11ce27c0dad3 1 个父辈 596c9d9b

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 4 行删除
@@ -50,7 +50,7 @@ class FormGlobalsoApi @@ -50,7 +50,7 @@ class FormGlobalsoApi
50 * @author zbj 50 * @author zbj
51 * @date 2023/5/17 51 * @date 2023/5/17
52 */ 52 */
53 - public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20) 53 + public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20, $ids = [])
54 { 54 {
55 $project = Project::getProjectByDomain($domain); 55 $project = Project::getProjectByDomain($domain);
56 $is_upgrade = $project['is_upgrade'] ??0; 56 $is_upgrade = $project['is_upgrade'] ??0;
@@ -63,6 +63,11 @@ class FormGlobalsoApi @@ -63,6 +63,11 @@ class FormGlobalsoApi
63 'page' => $page, 63 'page' => $page,
64 'source' => $is_upgrade ? '1,2,3,4' : '1,3' //来源类型 新项目用1,3 64 'source' => $is_upgrade ? '1,2,3,4' : '1,3' //来源类型 新项目用1,3
65 ]; 65 ];
  66 + if($ids){
  67 + $params['ids'] = implode(',', $ids);
  68 + unset($params['page']);
  69 + unset($params['limit']);
  70 + }
66 if($search){ 71 if($search){
67 $params['name'] = $search; 72 $params['name'] = $search;
68 } 73 }
@@ -168,7 +168,7 @@ class InquiryController extends BaseController @@ -168,7 +168,7 @@ class InquiryController extends BaseController
168 $data = $data['list'] ?? []; 168 $data = $data['list'] ?? [];
169 foreach ($data as &$item){ 169 foreach ($data as &$item){
170 //非正常登录的 170 //非正常登录的
171 - if($this->param['login_source'] != 2){ 171 + if($this->param['login_source']??0 != 2){
172 //脱敏 172 //脱敏
173 $item['email'] = email_desensitize($item['email']); 173 $item['email'] = email_desensitize($item['email']);
174 $item['phone'] = substr($item['phone'], 0, -4) . '****'; 174 $item['phone'] = substr($item['phone'], 0, -4) . '****';
@@ -40,10 +40,11 @@ class InquiryLogic extends BaseLogic @@ -40,10 +40,11 @@ class InquiryLogic extends BaseLogic
40 } 40 }
41 $search = $this->request['search'] ?: ''; 41 $search = $this->request['search'] ?: '';
42 $page = $this->request['page'] ?: 1; 42 $page = $this->request['page'] ?: 1;
  43 + $ids = $this->request['ids'] ?: [];
43 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); 44 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
44 $domain = (!empty( 45 $domain = (!empty(
45 $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''); 46 $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
46 - $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size); 47 + $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size, $ids);
47 //处理格式 免得前端又改 48 //处理格式 免得前端又改
48 $data = [ 49 $data = [
49 "list" => [], 50 "list" => [],
@@ -66,10 +67,14 @@ class InquiryLogic extends BaseLogic @@ -66,10 +67,14 @@ class InquiryLogic extends BaseLogic
66 $page_size = $export ? 1000 : 20; 67 $page_size = $export ? 1000 : 20;
67 $search = $this->request['search'] ?: ''; 68 $search = $this->request['search'] ?: '';
68 $page = $this->request['page'] ?: 1; 69 $page = $this->request['page'] ?: 1;
  70 + $ids = $this->request['ids'] ?? [];
69 $map = []; 71 $map = [];
70 if($search){ 72 if($search){
71 $map['email'] = ['like','%'.$search.'%']; 73 $map['email'] = ['like','%'.$search.'%'];
72 } 74 }
  75 + if ($ids) {
  76 + $map['id'] = ['in', $ids];
  77 + }
73 78
74 $data = (new InquiryOther())->lists($map,$page,$page_size,'id', 79 $data = (new InquiryOther())->lists($map,$page,$page_size,'id',
75 ['id', 'email', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), 'submit_time'] 80 ['id', 'email', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), 'submit_time']
@@ -83,15 +88,19 @@ class InquiryLogic extends BaseLogic @@ -83,15 +88,19 @@ class InquiryLogic extends BaseLogic
83 $search = $this->request['search'] ?: ''; 88 $search = $this->request['search'] ?: '';
84 $page = $this->request['page'] ?: 1; 89 $page = $this->request['page'] ?: 1;
85 $form_id = $this->request['form_id'] ?? ''; 90 $form_id = $this->request['form_id'] ?? '';
  91 + $ids = $this->request['ids'] ?? [];
86 $field = InquiryForm::getField($form_id); 92 $field = InquiryForm::getField($form_id);
87 $fields = ['id', 'data', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), DB::raw('submit_at as submit_time')]; 93 $fields = ['id', 'data', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), DB::raw('submit_at as submit_time')];
88 $lists = InquiryFormData::where('form_id', $form_id) 94 $lists = InquiryFormData::where('form_id', $form_id)
89 - ->where(function ($query) use ($search, $field){ 95 + ->where(function ($query) use ($search, $field,$ids){
90 if($search){ 96 if($search){
91 foreach ($field as $v){ 97 foreach ($field as $v){
92 $query->orWhere('data->' . $v, $search); 98 $query->orWhere('data->' . $v, $search);
93 } 99 }
94 } 100 }
  101 + if($ids){
  102 + $query->whereIn('ids', $ids);
  103 + }
95 }) 104 })
96 ->select($fields)->orderBy('id', 'desc')->paginate($page_size, ['*'], 'page', $page); 105 ->select($fields)->orderBy('id', 'desc')->paginate($page_size, ['*'], 'page', $page);
97 $data = $lists->toArray(); 106 $data = $lists->toArray();