diff --git a/module/achievement/excel.py b/module/achievement/excel.py index ef5391e..642e139 100644 --- a/module/achievement/excel.py +++ b/module/achievement/excel.py @@ -293,17 +293,17 @@ class ExcelReader: def _load_signature_images(self): signature_cells = { - "major_director_signature_image": "K34", - "course_leader_signature_image": "K35", + "major_director_signature_image": ("I34", "K34"), + "course_leader_signature_image": ("I35", "K35"), } wb_with_images: Workbook = openpyxl.load_workbook(self.file_path, data_only=True) try: sheet_with_images: Worksheet = wb_with_images["初始录入"] loader = self._SheetImageLoader(sheet_with_images) - for attr, cell in signature_cells.items(): - if loader.image_in(cell): - setattr(self, attr, loader.get(cell)) + for attr, (check_cell, image_cell) in signature_cells.items(): + if sheet_with_images[check_cell].value and loader.image_in(image_cell): + setattr(self, attr, loader.get(image_cell)) else: setattr(self, attr, None) finally: