Commit 8548aeb3 authored by maliang's avatar maliang

上传bug修复

parent 740a8cc0
...@@ -24,7 +24,7 @@ public class CopyrightBookController { ...@@ -24,7 +24,7 @@ public class CopyrightBookController {
} }
@PostMapping("/settlementBookMonth") @PostMapping("/settlementBookMonth")
@ApiOperation(value = "获取月结算数据") @ApiOperation(value = "获取书籍月结算数据")
@ResponseBody @ResponseBody
public String getSettlementBookMonthData(@RequestBody PageTableRequest request) { public String getSettlementBookMonthData(@RequestBody PageTableRequest request) {
return copyrightBookService.selectBookSettlement(request.getCopyrightIds(),request.getStartTime(),request.getEndTime(),request.getBookId(),request.getBookName(),request.getPage(),request.getLimit()); return copyrightBookService.selectBookSettlement(request.getCopyrightIds(),request.getStartTime(),request.getEndTime(),request.getBookId(),request.getBookName(),request.getPage(),request.getLimit());
......
...@@ -10,6 +10,9 @@ import java.util.List; ...@@ -10,6 +10,9 @@ import java.util.List;
@Mapper @Mapper
public interface CopyrightDao { public interface CopyrightDao {
@Select("select roleId from sys_role_user where userId=#{userId}")
Integer selectRoleId(@Param("userId") Long userId);
List<Long> selectUserAll(); List<Long> selectUserAll();
List<BaseSettlement> selectTableListMonth(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit); List<BaseSettlement> selectTableListMonth(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
......
...@@ -19,6 +19,8 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -19,6 +19,8 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
CopyrightDao copyrightDao; CopyrightDao copyrightDao;
@Override @Override
public String selectSettlement(Integer copyrightId,Integer page,Integer limit) { public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
Integer userId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
List<BaseSettlement> baseSettlementList =new ArrayList<>(); List<BaseSettlement> baseSettlementList =new ArrayList<>();
if(copyrightId==null||copyrightId==0){ if(copyrightId==null||copyrightId==0){
baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId()); baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment