Qchen 2 年 前
コミット
050f3854e6

+ 1 - 1
src/main/java/com/ydtech/modules/admin/model/dto/SysDeptAccountDto.java

@@ -27,7 +27,7 @@ public class SysDeptAccountDto {
     @ApiModelProperty(value = "已提现金额")
     @JsonFormat(pattern = "0.00")
     private BigDecimal totalAmount;
-    private int pageNo;
+    private int pageNum;
 
     private int pageSize;
 }

+ 2 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysDeptAccountServiceImpl.java

@@ -60,11 +60,11 @@ public class SysDeptAccountServiceImpl extends ServiceImpl<SysDeptAccountMapper,
 
     public IPage<SysDeptAccountDto> getDept(SysDeptAccountDto sysDeptAccountDto) {
         PageRequest pageRequest = new PageRequest();
-        pageRequest.setPageNum(sysDeptAccountDto.getPageNo());
+        pageRequest.setPageNum(sysDeptAccountDto.getPageNum());
         pageRequest.setPageSize(sysDeptAccountDto.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
         Page<SysDeptAccountDto> deptList = sysDeptAccountMapper.getDept(page,sysDeptAccountDto);
-        return page;
+        return deptList;
     }
 
     public List<SysDeptAccountByUserVo> getDeptAccountByUser() {

+ 1 - 1
src/main/resources/mapper/modules/admin/SysDeptAccountMapper.xml

@@ -15,7 +15,7 @@
     <select id="getDept" resultMap="BaseResultMap">
         SELECT
         a.dept_id,
-        b.NAME,
+        any_value(b.name) as name,
         a.management_fee,
         DATE(a.create_time) as create_date,
         SUM(CASE WHEN c.status = 0 THEN c.amount ELSE 0 END) AS waitAmount,