Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java

@@ -79,7 +79,7 @@ public class WfSubscriptionController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid @RequestBody WfSubscriptionPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+    public ResponseEntity<byte[]> exportData(@Valid @RequestBody WfSubscriptionPageDto dto) {
         List<WfSubscriptionExcelVo> customerList = wfSubscriptionService.getList(dto);
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
         EasyExcel.write(bot, WfSubscriptionExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);

src/main/resources/mapper/ledger/WfSubscriptionMapper.xml

@@ -9,10 +9,10 @@
         left join xjr_user t3 on t1.user_id = t3.id
         where 1 = 1
         <if test="dto.orgId != null">
-            and t2.id = #{dto.orgId}
+            and t1.id = #{dto.orgId}
         </if>
         <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
-            and t2.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
+            and t1.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
         </if>
         <if test="dto.userName != null and dto.userName != ''">
             and t3.name like concat('%', #{dto.userName}, '%')
@@ -26,10 +26,10 @@
         left join xjr_user t3 on t1.user_id = t3.id
         where 1 = 1
         <if test="dto.orgId != null">
-            and t2.id = #{dto.orgId}
+            and t1.id = #{dto.orgId}
         </if>
         <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
-            and t2.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
+            and t1.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
         </if>
         <if test="dto.userName != null and dto.userName != ''">
             and t3.name like concat('%', #{dto.userName}, '%')