修改bug

huanghongfa

2021-07-26 a562b13028f4fb52f38f3559821bbe0f3020848e

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java

@@ -45,7 +45,10 @@
            "join com_mng_struct_build_type t on b.type_id=t.id\n" +
            " <where>" +
            "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>" +
            "b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
            " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
            " </if> " +
            "<if test='comMngStructOtherBuildVO.communityId != null'>" +
            " and b.community_id = #{comMngStructOtherBuildVO.communityId} "+
            " </if> " +
            " </where>" +
            " order by b.create_at desc" +

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -864,10 +864,10 @@
                    AND grid_id = #{statisticsDTO.gridId}
                </if>
                <if test='statisticsDTO.startTime != null and statisticsDTO.startTime != &quot;&quot;'>
                    AND create_at <![CDATA[ >= ]]> #{statisticsDTO.startTime}
                    AND submit_date <![CDATA[ >= ]]> #{statisticsDTO.startTime}
                </if>
                <if test='statisticsDTO.endTime != null and statisticsDTO.endTime != &quot;&quot;'>
                    AND create_at <![CDATA[ <= ]]> #{statisticsDTO.endTime}
                    AND submit_date <![CDATA[ <= ]]> #{statisticsDTO.endTime}
                </if>
            ) AS eventZFTotal,
            (

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -150,7 +150,7 @@
                String orgName = partyBuildingMemberExcelVO.getOrgName();
                List<PartyOrganizationVO> collect = partyOrganizationVOArrayList.stream().filter(partyOrganizationVO -> orgName.equals(partyOrganizationVO.getName())).collect(Collectors.toList());
                if (ObjectUtils.isEmpty(collect)) {
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName());
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName() + "，请先在“党支部管理”中添加该党支部");
                }else{
                    PartyOrganizationVO partyOrganizationVO = collect.get(0);
                    comPbMemberDO.setOrgId(partyOrganizationVO.getId());