feature 催缴单增加用户地址

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwCollectionNoticeServiceImpl.java

@@ -364,15 +364,18 @@ public class SwCollectionNoticeServiceImpl implements SwCollectionNoticeService
                 } else {
                     secondMap = new HashMap<>();
                 }
-                currentDoc.getMailMerge().execute(new String[]{"USERNAME", "USERNUMBER", "YEAR", "QYMC", "RQ", "sfdt", "GZHMC",
-                                "USERNAME2", "USERNUMBER2",
+                currentDoc.getMailMerge().execute(new String[]{"USERNAME", "USERNUMBER","dz1", "YEAR", "QYMC", "RQ", "sfdt", "GZHMC",
+                                "USERNAME2", "USERNUMBER2","dz2"
                         },
                         new Object[]{firstMap.getOrDefault("USERNAME", ""),
-                                firstMap.getOrDefault("USERNUMBER", ""), dateStr,
+                                firstMap.getOrDefault("USERNUMBER", ""),
+                                firstMap.getOrDefault("ADDRESS", ""),
+                                dateStr,
                                 swEnterpriseConfigInfoDo.getEnterprisename(), nowStr, addresStr,
                                 swEnterpriseConfigInfoDo.getGzhmc(),
                                 secondMap.getOrDefault("USERNAME", ""),
-                                secondMap.getOrDefault("USERNUMBER", "")
+                                secondMap.getOrDefault("USERNUMBER", ""),
+                                secondMap.getOrDefault("ADDRESS", "")
                         });
                 currentDoc.getMailMerge().setCleanupOptions(MailMergeCleanupOptions.REMOVE_UNUSED_FIELDS);
                 currentDoc.getMailMerge().setCleanupOptions(MailMergeCleanupOptions.REMOVE_EMPTY_TABLE_ROWS);