|
@@ -152,10 +152,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
|
|
|
OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
|
|
|
Long curren = oppendedProductVO.getCurrent();
|
|
|
Long size = oppendedProductVO.getSize();
|
|
|
- if (curren == null) {
|
|
|
+ if (curren == null || curren==0) {
|
|
|
oppendedProductVO.setCurrent(1L);
|
|
|
}
|
|
|
- if (size == null) {
|
|
|
+ if (size == null || curren==0) {
|
|
|
oppendedProductVO.setSize(10L);
|
|
|
}
|
|
|
BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
|
|
@@ -175,13 +175,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
|
|
|
for (OpendProductWrapper bean : list) {
|
|
|
UserOrgDTO uo = dataMap.get(bean.getUserId());
|
|
|
if (uo != null) {
|
|
|
- bean.setUsername(uo.getUsername());
|
|
|
- bean.setLinkman(uo.getLinkman());
|
|
|
- bean.setEmail(uo.getEmail());
|
|
|
- bean.setOrgId(uo.getOrgId());
|
|
|
- bean.setOrgName(uo.getOrgName());
|
|
|
- bean.setIsReject(uo.getIsReject());
|
|
|
- bean.setAuStatus(uo.getAuStatus());
|
|
|
+ BeanUtil.copyProperties(uo,bean);
|
|
|
}
|
|
|
}
|
|
|
return list;
|