From 3f0b1d7bb0ff1960e5f2efbcca7a1a3a90487186 Mon Sep 17 00:00:00 2001
From: liyf <liyf@connor.net.cn>
Date: Fri, 17 Jan 2020 11:07:05 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HEZON_ITK/bs_test_release_check.cpp | 36 ++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/HEZON_ITK/bs_test_release_check.cpp b/HEZON_ITK/bs_test_release_check.cpp
index 1646f8d..f998825 100644
--- a/HEZON_ITK/bs_test_release_check.cpp
+++ b/HEZON_ITK/bs_test_release_check.cpp
@@ -28,37 +28,47 @@ int bs_test_release_check(EPM_rule_message_t msg)
 		{
 			continue;
 		}
-		printf("release check1\n");
 		AOM_ask_value_tags(attachments[i], "JD2_CSJH", &tag_cnt, &tags);
 		for(int j=0;j<tag_cnt;j++)
 		{
 			int tag_cnt2;
-			tag_t *tags2;
-			ITEM_ask_latest_rev(tags[j], &tag);
-			AOM_ask_value_tags(attachments[i], "JD2_CSBG", &tag_cnt2, &tags2);
+			tag_t *tags2,temp_tag;
+			ITEM_ask_latest_rev(tags[j], &temp_tag);
+			AOM_ask_value_tags(temp_tag, "JD2_CSBG", &tag_cnt2, &tags2);
+			printf("release check1\n");
 
-		}
-		printf("release check2\n");
+			for(int k=0;k<tag_cnt2;k++)
+			{
+				ITEM_ask_latest_rev(tags2[k], &tag);
+				AOM_ask_value_tags(tag, "release_status_list", &rel_cnt, &rels);
+				if (rel_cnt == 0)
+				{
+					AOM_ask_value_string(tag, "object_string", &val);
+					name << val << ",";
+					ifail = EPM_nogo;
+				}
+			}
+			AOM_ask_value_tags(temp_tag, "JD2_CSBGHZ", &tag_cnt2, &tags2);
+			printf("release check2\n");
 
-		AOM_ask_value_tags(attachments[i], "JD2_CSBG", &tag_cnt, &tags);
-		for (int j = 0; j<tag_cnt; j++)
-		{
-			if (isTypeOf(tags[j], "JD2_CSBGHZ"))
+			for (int k = 0; k<tag_cnt2; k++)
 			{
-				ITEM_ask_latest_rev(tags[j], &tag);
+				ITEM_ask_latest_rev(tags2[k], &tag);
 				AOM_ask_value_tags(tag, "release_status_list", &rel_cnt, &rels);
 				if (rel_cnt == 0)
 				{
 					AOM_ask_value_string(tag, "object_string", &val);
-					name <<val<<",";
+					name << val << ",";
 					ifail = EPM_nogo;
 				}
 			}
 		}
+
+		
 		
 	}
 	if (ifail == EPM_nogo) {
-		name <<"测试计划未发布，请先审核发布！";
+		name <<"未发布，请先审核发布！";
 		EMH_store_error_s1(EMH_severity_user_error, EMH_PROP_error_base, name.str().c_str());
 	}
 	return ifail;