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

曾成

2020-03-28 983acc56b667c90804dbf5f46dae8f0161876380

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

@@ -1,20 +1,18 @@
package com.java110.community.smo.impl;


import com.java110.common.util.BeanConvertUtil;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IServiceServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.service.IServiceInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.service.ServiceDto;
import com.java110.dto.service.ServiceProvideDto;
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;

/**
@@ -43,7 +41,6 @@

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

        List<ServiceDto> services = BeanConvertUtil.covertBeanList(serviceServiceDaoImpl.getServiceInfo(BeanConvertUtil.beanCovertMap(serviceDto)), ServiceDto.class);
@@ -102,7 +99,6 @@

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

        List<ServiceProvideDto> services = BeanConvertUtil.covertBeanList(serviceServiceDaoImpl.getServiceProvideInfo(BeanConvertUtil.beanCovertMap(serviceProvideDto)), ServiceProvideDto.class);