|
|
@@ -16,6 +16,7 @@ namespace app\common\logic;
|
|
|
|
|
|
use app\common\enum\notice\NoticeEnum;
|
|
|
use app\common\enum\YesNoEnum;
|
|
|
+use app\common\model\channel\OfficialAuth;
|
|
|
use app\common\model\notice\NoticeRecord;
|
|
|
use app\common\model\notice\NoticeSetting;
|
|
|
use app\common\model\user\User;
|
|
|
@@ -103,9 +104,13 @@ class NoticeLogic extends BaseLogic
|
|
|
$params['params']['user_sn'] = $user['sn'];
|
|
|
$params['params']['mobile'] = $user['mobile'];
|
|
|
$wx_user = UserAuth::where('worker_id',$params['params']['user_id'])->findOrEmpty()->toArray();
|
|
|
- //$wx_user['openid'] $wx_user['unionid']
|
|
|
- $params['params']['openid'] = $wx_user['openid']??'';
|
|
|
- $params['params']['unionid'] = $wx_user['unionid']??'';
|
|
|
+ $params['params']['openid'] = '';
|
|
|
+ $params['params']['unionid'] = '';
|
|
|
+ if(isset($wx_user['unionid']) && !empty($wx_user['unionid'])) {
|
|
|
+ $openid = OfficialAuth::where('unionid',$wx_user['unionid'])->value('openid');
|
|
|
+ $params['params']['openid'] = $openid?:'';
|
|
|
+ $params['params']['unionid'] = $wx_user['unionid']?:'';
|
|
|
+ }
|
|
|
}
|
|
|
}elseif($recipient == 3) {
|
|
|
// 工程师相关
|
|
|
@@ -116,9 +121,13 @@ class NoticeLogic extends BaseLogic
|
|
|
$params['params']['user_sn'] = $user['sn'];
|
|
|
$params['params']['mobile'] = $user['mobile'];
|
|
|
$wx_user = MasterWorkerAuth::where('worker_id',$params['params']['user_id'])->findOrEmpty()->toArray();
|
|
|
- //$wx_user['openid'] $wx_user['unionid']
|
|
|
- $params['params']['openid'] = $wx_user['openid']??'';
|
|
|
- $params['params']['unionid'] = $wx_user['unionid']??'';
|
|
|
+ $params['params']['openid'] = '';
|
|
|
+ $params['params']['unionid'] = '';
|
|
|
+ if(isset($wx_user['unionid']) && !empty($wx_user['unionid'])) {
|
|
|
+ $openid = OfficialAuth::where('unionid',$wx_user['unionid'])->value('openid');
|
|
|
+ $params['params']['openid'] = $openid?:'';
|
|
|
+ $params['params']['unionid'] = $wx_user['unionid']?:'';
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
// 后台账号
|