|
@@ -52,7 +52,7 @@ public class VoucherServiceImpl extends BaseMybatisDao<JtVoucherMapper> implemen
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<JtVoucherListBo> selectVoucherList(String name, Integer limitUse, Integer activeState, Integer source,
|
|
public Pagination<JtVoucherListBo> selectVoucherList(String name, Integer limitUse, Integer activeState, Integer source,
|
|
|
- Integer pageNo, Integer pageSize) {
|
|
|
|
|
|
|
+ String uid,Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
if (pageNo==null||pageNo<1) pageNo=1;
|
|
if (pageNo==null||pageNo<1) pageNo=1;
|
|
|
if (pageSize==null||pageSize<1) pageSize=10;
|
|
if (pageSize==null||pageSize<1) pageSize=10;
|
|
@@ -60,7 +60,8 @@ public class VoucherServiceImpl extends BaseMybatisDao<JtVoucherMapper> implemen
|
|
|
if (null != limitUse) params.put("limitUse", limitUse);
|
|
if (null != limitUse) params.put("limitUse", limitUse);
|
|
|
if (null != activeState) params.put("activeState", activeState);
|
|
if (null != activeState) params.put("activeState", activeState);
|
|
|
if (null != source) params.put("source", source);
|
|
if (null != source) params.put("source", source);
|
|
|
- if(TokenManager.getToken() instanceof User)params.put("uid", TokenManager.getUserId());
|
|
|
|
|
|
|
+ if(uid==null&&TokenManager.getToken() instanceof User)params.put("uid", TokenManager.getUserId());
|
|
|
|
|
+ if (StringUtils.isNotBlank(uid))params.put("uid", uid);
|
|
|
//params.put("uid", "1");
|
|
//params.put("uid", "1");
|
|
|
return (Pagination<JtVoucherListBo>) findPage("selectVoucherList", "selectVoucherCount",params,
|
|
return (Pagination<JtVoucherListBo>) findPage("selectVoucherList", "selectVoucherCount",params,
|
|
|
pageNo, pageSize);
|
|
pageNo, pageSize);
|