合并

pom.xml

@@ -203,7 +203,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
-					<include>mapper/*.xml</include>
+					<include>mapper/**/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -322,7 +322,7 @@ public class TaBuildingDynamicController extends BaseController {
                        customerQueryWrapper.eq("person_id",enlist.getPersonId());
                        customerQueryWrapper.eq("building_id",enlist.getBuildingId());
                        TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
-                       if (recommendCustomer.getStatus().equals(CommConstant.CUSTOMER_REPORT)){
+                       if (null != recommendCustomer&&recommendCustomer.getStatus().equals(CommConstant.CUSTOMER_REPORT)){
                            System.out.println("验证3");
                            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                            recommendCustomer.setArrivalDate(LocalDateTime.now());

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -42,7 +42,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * 根据经纬度获取城市详情信息
      *
      * @param location
-     * @return
+     * @return  
      */
     @Override
     public TdCity getLocationCity(String location) {

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -51,7 +51,6 @@
         GROUP BY
             c.org_id,c.realty_consultant
     </select>
-
     <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
           *
@@ -65,4 +64,5 @@
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
         order by `day`
     </select>
+
 </mapper>