Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComStreetDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComActService;
import org.springframework.beans.BeanUtils;
@@ -54,7 +57,6 @@
        if (integer > 0) {
            return R.fail("社区已经存在");
        }
        comActDO.setCommunityId(Snowflake.getId());
        BeanUtils.copyProperties(comActVO, comActDO);
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
@@ -193,5 +195,14 @@
        return R.fail();
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @Override
    public R getCommunityLists(){
        return R.ok(this.comActDAO.getCommunityLists());
    }


}