add

associate/models/agile_tag.py

@@ -11,6 +11,7 @@ from gm_types.gaia import (
     AGILE_TAG_CREATE_TYPE,
     AGILE_TAG_STYLE,
     AGILE_TAG_RECOMMEND_TYPE,
+
 )
 
 
@@ -45,8 +46,8 @@ class AgileTag(BaseModel):
 
     def get_api_agile_tag_recommend_type(self):
         try:
-            results = AgileTagRecommendType.objects.filter(agile_tag_id=self.id).values_list("agile_tag_type",
-                                                                                             flat=True).first()
+            results = AgileTagRecommendType.objects.filter(agile_tag_id=self.id,
+                                                           agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list("agile_tag_type",flat=True).first()
             return results
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())

associate/utils/agile_tag_transfer.py

@@ -17,6 +17,7 @@ from associate.commons.words_utils import QueryWordAttr
 from associate.models import agile_tag
 from gm_types.gaia import (
     AGILE_TAG_TYPE,
+    AGILE_TAG_RECOMMEND_TYPE
 )
 
 
@@ -25,7 +26,11 @@ class TagTransfer(object):
     @classmethod
     def get_tag_suggest_data_list(cls, instance):
         try:
+            results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
+                                                                     agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
+                "agile_tag_type", flat=True).first()
 
+            if results:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))
@@ -87,7 +92,11 @@ class TagTransfer(object):
         try:
             result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
                                                            agile_tag_type=AGILE_TAG_TYPE.PROJECT)
-            if result:
+
+            results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
+                                                                     agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
+                "agile_tag_type", flat=True).first()
+            if result and results:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))
@@ -118,7 +127,10 @@ class TagTransfer(object):
         try:
             result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
                                                            agile_tag_type=AGILE_TAG_TYPE.POSITION)
-            if result:
+            results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
+                                                                     agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
+                "agile_tag_type", flat=True).first()
+            if result and results:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))
@@ -149,7 +161,10 @@ class TagTransfer(object):
         try:
             result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
                                                            agile_tag_type=AGILE_TAG_TYPE.INSTRUMENT)
-            if result:
+            results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
+                                                                     agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
+                "agile_tag_type", flat=True).first()
+            if result and results:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))
@@ -180,7 +195,10 @@ class TagTransfer(object):
         try:
             result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
                                                            agile_tag_type=AGILE_TAG_TYPE.HOSPITAL)
-            if result:
+            results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
+                                                                     agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
+                "agile_tag_type", flat=True).first()
+            if result and results:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))