diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py
index f058e1c4..e6c187f9 100644
--- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py
+++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py
@@ -119,8 +119,8 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
         notdm_flg,
         (
             CASE
-                WHEN DATE_FORMAT(aply_start_ymd, '%Y%m%d') > DATE_FORMAT(STR_TO_DATE(:syor_date, '%Y%m%d'), '%Y%m%d') -1 THEN DATE_FORMAT(aply_start_ymd, '%Y%m%d')
-                ELSE DATE_FORMAT(STR_TO_DATE(:syor_date, '%Y%m%d'), '%Y%m%d') -1
+                WHEN DATE_FORMAT(aply_start_ymd, '%Y%m%d') > DATE_FORMAT(:syor_date, '%Y%m%d') -1 THEN DATE_FORMAT(aply_start_ymd, '%Y%m%d')
+                ELSE DATE_FORMAT(:syor_date, '%Y%m%d') -1
             END
         ) AS aply_end_ymd,
         :execute_date_str_ymd,
@@ -205,8 +205,13 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
             
             make_history_query = self.TO_HISTORY_QUERY
 
+        update_columns = ','.join(set_clauses)
+        if len(update_columns) > 0:
+            # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる
+            update_columns += ','
+
         update_query = self.UPDATE_QUERY.format(
-            update_columns=','.join(set_clauses)
+            update_columns=update_columns
         )
         
         return [make_history_query, update_query]