data

server/apps/ability/views.py

@@ -127,8 +127,24 @@ def import_cnas(filename, path):
     i = 3
     while sheet['l'+str(i)].value:
         data = {}
-        data['lbmc'] = sheet['b'+str(i)].value
-        data['xmmc'] = sheet['g'+str(i)].value
+        if sheet['b'+str(i)].value:
+            data['lbmc'] = sheet['b'+str(i)].value
+        else:
+            m = i - 1
+            while True:
+                if sheet['b'+str(m)].value:
+                    data['lbmc'] = sheet['b'+str(m)].value
+                    break
+                m = m - 1
+        if sheet['g'+str(i)].value:
+            data['xmmc'] = sheet['g'+str(i)].value
+        else:
+            m = i - 1
+            while True:
+                if sheet['g'+str(m)].value:
+                    data['xmmc'] = sheet['g'+str(m)].value
+                    break
+                m = m - 1
         data['bzmc'] = sheet['l'+str(i)].value
         data['bzbh'] = sheet['n'+str(i)].value
         data['bztk'] = sheet['q'+str(i)].value