add

api/Appapi/Model/Home.php

@@ -17,20 +17,29 @@ class Model_Home extends PhalApi_Model_NotORM {
 		return $rs;
 		return $rs;
 	}
 	}
 
 
-    public function getUserLabel($uid,$touid)
+    /* 印象标签 */
+    public function getImpressionLabel()
     {
     {
-        $key="getMyLabel_".$touid;
-        $labels=getcaches($key);
-        $domain = new Domain_User();
-        if(!$labels){
-            $labels = $domain->getMyLabel($touid);
-            setcaches($key,$labels);
+
+        $key = "getImpressionLabel2";
+        $list = getcaches($key);
+        if (!$list) {
+            $list = DI()->notorm->impression_label2->select("*")->fetchAll();
+            foreach ($list as $k => $v) {
+                $list[$k]['colour'] = '#' . $v['colour'];
+            }
+
+            setcaches($key, $list);
         }
         }
-        $labelIds = $domain->getUserLabel($uid,$touid);
-        $labelIds=preg_split('/,|，/',$labelIds['label']);
 
 
-        $l = [];
+        return $list;
+    }
 
 
+    public function getUserLabel($user)
+    {
+        $labels = $this->getImpressionLabel();
+        $l = [];
+        $labelIds = [$user['label_id']];
         foreach ($labels as $label) {
         foreach ($labels as $label) {
             if (in_array($label['id'], $labelIds)) {
             if (in_array($label['id'], $labelIds)) {
                 $l[] = $label;
                 $l[] = $label;
@@ -94,7 +103,7 @@ class Model_Home extends PhalApi_Model_NotORM {
 				$v['type_val']='';
 				$v['type_val']='';
 			}
 			}
 
 
-			$v['label'] = $this->getUserLabel($uid, $v['uid']);
+			$v['label'] = $this->getUserLabel($userinfo);
 
 
             $result[$k]=$v;
             $result[$k]=$v;
 
 
@@ -1083,7 +1092,7 @@ class Model_Home extends PhalApi_Model_NotORM {
                 if($v['type']==1){
                 if($v['type']==1){
                     $v['type_val']='';
                     $v['type_val']='';
                 }
                 }
-                $v['label'] = $this->getUserLabel($uid, $v['uid']);
+                $v['label'] = $this->getUserLabel($userinfo);
 
 
                 $result[$k]=$v;
                 $result[$k]=$v;
 
 
@@ -1140,7 +1149,7 @@ class Model_Home extends PhalApi_Model_NotORM {
                 if($v['type']==1){
                 if($v['type']==1){
                     $v['type_val']='';
                     $v['type_val']='';
                 }
                 }
-                $v['label'] = $this->getUserLabel($uid, $v['uid']);
+                $v['label'] = $this->getUserLabel($userinfo);
                 $result[$k]=$v;
                 $result[$k]=$v;
             }
             }
             if($result){
             if($result){