From 4129b03cbcf921a4de28dac86fad66d4ad1770d0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 13 Nov 2023 11:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=9B=9E=20=E7=AE=80=E4=BB=8B=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E4=B8=9A=E5=8A=A1=EF=BC=8C=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/weliam_smartcity/plugin/recruit/uniapp.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/weliam_smartcity/plugin/recruit/uniapp.php b/addons/weliam_smartcity/plugin/recruit/uniapp.php
index 15b3073..dcc65c2 100644
--- a/addons/weliam_smartcity/plugin/recruit/uniapp.php
+++ b/addons/weliam_smartcity/plugin/recruit/uniapp.php
@@ -221,9 +221,18 @@ class RecruitModuleUniapp extends Uniapp
             foreach ($img as &$imgVal) $imgVal = tomedia($imgVal);
             $info['img'] = $img;
         }
-        $recruit_long_img = pdo_getcolumn(PDO_NAME . 'merchantdata',['id' => $info['release_sid']],'recruit_long_img');
-        $info['recruit_long_img'] = empty($recruit_long_img) ? array() : explode('||',$recruit_long_img);// 企业长图
-        foreach ($info['recruit_long_img'] as $key => $recruit_long_img_val) $info['recruit_long_img'][$key] = tomedia($recruit_long_img_val);
+        if ($info['release_sid']) {
+            $merchantData = pdo_get(PDO_NAME . 'merchantdata',['id' => $info['release_sid']],['recruit_long_img','introduction']);
+            $recruit_long_img = $merchantData['recruit_long_img'];
+            $info['introduction'] = $merchantData['introduction'];
+            $info['recruit_long_img'] = empty($recruit_long_img) ? array() : explode('||',$recruit_long_img);// 企业长图
+            foreach ($info['recruit_long_img'] as $key => $recruit_long_img_val) $info['recruit_long_img'][$key] = tomedia($recruit_long_img_val);
+            $MerchantDataEnt = MerchantDataEnt::getStoreEntData($info['release_sid']);
+            if ($MerchantDataEnt) {
+                $info['business'] = $MerchantDataEnt['business'];
+                $info['advantage'] = $MerchantDataEnt['advantage'];
+            }
+        }
         $collect_id = pdo_get(PDO_NAME . 'recruit_collect',['mid' => $_W['mid'],'recruit_id' => $id],['id']);
         $info['is_collect'] = $collect_id ? true : false;// 当前用户是否收藏
         $info['collect_id'] = $collect_id ?: '';        // 收藏id