Browse Source

excel_util: 筛选规则调整

Signed-off-by: binren <zhangbr@elab-plus.com>
binren 5 years ago
parent
commit
e6fc9e7bd2
1 changed files with 2 additions and 1 deletions
  1. 2 1
      excel_util.py

+ 2 - 1
excel_util.py

@@ -204,7 +204,8 @@ class ExcelUtil:
         for row in rows:
             question_value = row[2].value
             sub_option_value = row[9].value
-            if question_value != '占位题' or str(sub_option_value).find('占位') != -1:
+            name = row[12].value
+            if (question_value != '占位题' or str(sub_option_value).find('占位') != -1) and name is not None and str(name).find('占位') != -1:
                 key = str(int(row[1].value)) + str(int(row[9].value))
                 # 数据类型,数据项名称,所在tab
                 info[key] = [row[15].value, row[13].value, row[14].value]