|
|
@@ -3518,13 +3518,13 @@ class Sale extends Base
|
|
|
$role = $this->checkDataShare();
|
|
|
if (!empty($role[DataGroupModel::$type_全部])) {
|
|
|
$arr= array_unique(array_merge($hand,$role[DataGroupModel::$type_全部]));
|
|
|
- if($condition!='') $condition.="or ";
|
|
|
+ if($condition!='') $condition.=" or ";
|
|
|
$condition .= " a.apply_id in (" . implode(',',$arr) . ")";
|
|
|
}
|
|
|
}
|
|
|
$personid=Db::name('supplier')->field('id')->where(['is_del'=>0,'personid'=> $hand])->findOrEmpty();
|
|
|
if($personid){
|
|
|
- if($condition!='') $condition.="or ";
|
|
|
+ if($condition!='') $condition.=" or ";
|
|
|
$condition.="(b.is_stock=0 and sip.personid in ($uidarr))";
|
|
|
}
|
|
|
}
|
