冲突

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java

@@ -246,7 +246,10 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zhy
      * @date 2022/8/19 17:32
      */
-    List<BuildingResultDTO> listBuildingInfo(String customerId,String agencyId,String  gridId,String buildingName);
+    List<BuildingResultDTO> listBuildingInfo(@Param("customerId") String customerId,
+                                             @Param("agencyId") String agencyId,
+                                             @Param("gridId") String  gridId,
+                                             @Param("buildingName") String buildingName);
 
 
     /**

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -516,9 +516,9 @@
             </if>
     </select>
 
-        SELECT
     <select id="listBuildingInfo" resultType="com.epmet.dto.result.BuildingResultDTO">
-    CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label,
+        select
+            CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label,
             b.id AS buildingId,
             b.BUILDING_NAME AS buildingName,
             n.id AS neighborhoodId,