wuxw
2019-12-22 2f6d8346c2a5c36c05fb18e43551bb2d5883c33a
查询小区时取消 分页判断
3个文件已修改
19 ■■■■ 已修改文件
Api/src/main/java/com/java110/api/listener/community/ListMyEnteredCommunitysListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/pageFramePackage/initData/initData.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/community/ListMyEnteredCommunitysListener.java
@@ -67,7 +67,7 @@
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
        //super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含商户信息");
        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含用户信息");
    }
UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java
@@ -56,8 +56,12 @@
        List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);
        String[] communityIds = getCommunityIds(orgs);
        if (communityIds == null || communityIds.length < 0) {
            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 +112,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;
            }
WebService/src/main/resources/components/pageFramePackage/initData/initData.js
@@ -13,9 +13,14 @@
        },
        methods: {
            _loadCommunityInfo: function (_param) {
                var param = {
                    params:{
                        _uId:'ccdd00opikookjuhyyttvhnnjuuu'
                    }
                };
                vc.http.get('initData',
                    'getCommunitys',
                    '',
                    param,
                    function (json, res) {
                        if (res.status == 200) {
                            var _communityInfos = JSON.parse(json);