Merge branch 'back' of https://github.com/java110/MicroCommunity into back

曾成

2020-03-28 983acc56b667c90804dbf5f46dae8f0161876380

 CommunityService/src/main/java/com/java110/community/smo/impl/ServiceBusinessInnerServiceSMOImpl.java

@@ -1,19 +1,17 @@
package com.java110.community.smo.impl;


import com.java110.common.util.BeanConvertUtil;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IServiceBusinessServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.service.IServiceBusinessInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.service.ServiceBusinessDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**
@@ -42,7 +40,6 @@

        if (page != PageDto.DEFAULT_PAGE) {
            serviceBusinessDto.setPage((page - 1) * serviceBusinessDto.getRow());
            serviceBusinessDto.setRow(page * serviceBusinessDto.getRow());
        }

        List<ServiceBusinessDto> serviceBusinesss = BeanConvertUtil.covertBeanList(serviceBusinessServiceDaoImpl.getServiceBusinessInfo(BeanConvertUtil.beanCovertMap(serviceBusinessDto)), ServiceBusinessDto.class);