|
@@ -25,6 +25,7 @@ class Model_logic_whlabel extends Lin_Model {
|
|
$this->pmData();
|
|
$this->pmData();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
foreach($list as $k=>$v){
|
|
foreach($list as $k=>$v){
|
|
if(in_array('pm',$condition)){
|
|
if(in_array('pm',$condition)){
|
|
$list[$k]['pm'] = $this->getPm($v['features']);
|
|
$list[$k]['pm'] = $this->getPm($v['features']);
|
|
@@ -80,9 +81,14 @@ class Model_logic_whlabel extends Lin_Model {
|
|
if(in_array(130,$features)){
|
|
if(in_array(130,$features)){
|
|
$type = 130;
|
|
$type = 130;
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ $tmp_features = [];
|
|
|
|
+ $t = $this->pmList;
|
|
|
|
+ foreach($features as $v){
|
|
|
|
+ if(isset($t[$v])){
|
|
|
|
+ $tmp_features[] = $t[$v];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
- return $this->logic_weight->getWeightByFeature($type,$features);
|
|
|
|
|
|
+ return $this->logic_weight->getWeightByFeature($type,$tmp_features);
|
|
}
|
|
}
|
|
}
|
|
}
|