Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java

@@ -5,9 +5,7 @@
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.org.IOrgInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.OwnerDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.org.OrgDto;
import com.java110.user.dao.IOrgServiceDao;
@@ -15,8 +13,6 @@
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
@@ -56,8 +52,12 @@

        List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);

        String[] communityIds = getCommunityIds(orgs);
        if (communityIds == null || communityIds.length < 1) {
            return orgs;
        }
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityIds(getCommunityIds(orgs));
        communityDto.setCommunityIds(communityIds);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);

        for (CommunityDto tmpCommunityDto : communityDtos) {
@@ -108,11 +108,11 @@
    private String[] getCommunityIds(List<OrgDto> orgDtos) {
        List<String> communityIds = new ArrayList<String>();
        for (OrgDto orgDto : orgDtos) {
            if("9999".equals(orgDto.getBelongCommunityId())){
            if ("9999".equals(orgDto.getBelongCommunityId())) {
                orgDto.setBelongCommunityName("入驻所有小区");
                continue;
            }
            if(StringUtil.isEmpty(orgDto.getBelongCommunityId())){
            if (StringUtil.isEmpty(orgDto.getBelongCommunityId())) {
                orgDto.setBelongCommunityName("未知小区");
                continue;
            }