crm的bug修改

xuhy

2 天以前 7f92cc32ed8a2a08c74a6a8c871b5e1863dce458

crm的bug修改

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java

@@ -97,11 +97,13 @@
        if(!CollectionUtils.isEmpty(branchAreas)){
            List<String> branchAreaCityCodes = branchAreas.stream().map(TCrmBranchArea::getCityCode).collect(Collectors.toList());

            if(!CollectionUtils.isEmpty(branchAreaCityCodes)){
            long count = crmBranchAreaService.count(Wrappers.lambdaQuery(TCrmBranchArea.class).in(TCrmBranchArea::getCityCode, branchAreaCityCodes));
            if(count > 0){
                return R.fail("区域已存在");
            }
        }
        }

        this.save(dto);
        // 添加区域

 ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml

@@ -38,7 +38,7 @@
            <if test="query.status != null">
                AND status = #{query.status}
            </if>
            <if test="query.reportType != null and query.query.reportUserId !=null">
            <if test="query.reportType != null and query.reportUserId !=null">
                AND report_type = #{query.reportType} and report_user_id =#{query.reportUserId}
            </if>
            <if test="query.createBy != null and query.createBy != ''">