【CHG】线路信息返回对象用错

railway-business/src/main/java/com/railway/business/baseinfo/mapper/BaseLineMapper.java

@@ -46,6 +46,6 @@ public interface BaseLineMapper {
   /**
    * 查询列表
    */
-  List<BaseLine> getListByDeptId(@Param("deptId") Long deptId);
+  Page<BaseLine> getListByDeptId(@Param("deptId") Long deptId);
 
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseLineServiceImpl.java

@@ -97,6 +97,9 @@ public class BaseLineServiceImpl implements IBaseLineService {
   @Override
   public BaseLineVo getInfo(Long lineId) {
     BaseLine line = baseLineMapper.getInfo(lineId);
+    if(null == line){
+      return null;
+    }
     return setBaseLine(line);
   }
 

railway-business/src/main/resources/mapper/baseinfo/BaseLineMapper.xml

@@ -172,8 +172,8 @@
     </where>
   </select>
 
-  <select id="getListByDeptId" resultType="com.railway.business.baseinfo.domain.BaseLine">
-    SELECT
+  <select id="getListByDeptId" resultMap="BaseResultMap">
+    SELECT DISTINCT
     <include refid="Base_Column_List"/>
     FROM base_line t
     left join base_dept_line t1 on t.line_id = t1.line_id