|
@@ -21,7 +21,7 @@
|
|
|
<result property="updateBy" column="update_by"/>
|
|
|
<result property="updateTime" column="update_time"/>
|
|
|
<result property="updateName" column="update_name"/>
|
|
|
-
|
|
|
+ <result property="personName" column="person_name"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectCenterdataTSupermapLevelVo">
|
|
@@ -32,7 +32,10 @@
|
|
|
<select id="selectCenterdataTSupermapLevelList" parameterType="CenterdataTSupermapLevel"
|
|
|
resultMap="CenterdataTSupermapLevelResult">
|
|
|
SELECT a.id, a.name, a.map_address,a.type, a.map_data, a.map_name, a.longitude, a.latitude, a.dept_id,
|
|
|
- a.dept_name,a.create_by,a.create_time,a.create_name,a.update_by,a.update_time,a.update_name FROM centerdata_t_supermap_level a
|
|
|
+ a.dept_name, a.create_by, a.create_time, a.create_name, a.update_by, a.update_time, a.update_name,
|
|
|
+ group_concat(p.person_name) person_name
|
|
|
+ FROM centerdata_t_supermap_level a
|
|
|
+ LEFT JOIN centerdata_t_level_person_n p ON p.supermap_level_id = a.id
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
|
|
|
<where>
|
|
|
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
|
|
@@ -42,10 +45,12 @@
|
|
|
<if test="longitude != null and longitude != ''">and longitude = #{longitude}</if>
|
|
|
<if test="latitude != null and latitude != ''">and latitude = #{latitude}</if>
|
|
|
<if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
|
|
|
- <if test="type != null and type != ''">and type = #{type}</if>
|
|
|
+ <if test="type != null and type != ''">and a.type = #{type}</if>
|
|
|
<if test="deptName != null and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
|
|
|
+ <if test="personName != null and personName != ''">and p.person_name like concat('%',#{personName},'%')</if>
|
|
|
${params.dataScope}
|
|
|
</where>
|
|
|
+ GROUP BY a.id
|
|
|
ORDER BY a.create_time DESC
|
|
|
</select>
|
|
|
|