|
|
@@ -6,6 +6,7 @@ import com.izouma.dingdong.dto.PageQuery;
|
|
|
import com.izouma.dingdong.exception.BusinessException;
|
|
|
import com.izouma.dingdong.repo.MoneyRecordRepo;
|
|
|
import com.izouma.dingdong.utils.ObjUtils;
|
|
|
+import com.izouma.dingdong.utils.SecurityUtils;
|
|
|
import com.izouma.dingdong.utils.excel.ExcelUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -62,9 +63,10 @@ public class MoneyRecordController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/my")
|
|
|
- public Page<MoneyRecord> my(PageQuery pageQuery, Long userId) {
|
|
|
+ public Page<MoneyRecord> my(PageQuery pageQuery) {
|
|
|
// Map<String, Object> query = pageQuery.getQuery();
|
|
|
// query.put("time","2020-05-14 00:00:00,2020-05-14 13:59:59");
|
|
|
+ Long userId = SecurityUtils.getAuthenticatedUser().getId();
|
|
|
List<MoneyRecord> all = moneyRecordRepo.findAll(toSpecification(pageQuery, MoneyRecord.class));
|
|
|
List<MoneyRecord> my = new ArrayList<>();
|
|
|
all.forEach(a -> {
|
