~chenjialiang/moral.git

			@@ -28,9 +28,6 @@
			</resultMap>

			<resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">
			<!--行业-->
			<result column="profession_name" property="professionName"/>

			<!--工艺-->
			<result column="tech_name" property="techName"/>

			@@ -71,6 +68,12 @@
			<collection property="operators" ofType="com.moral.api.entity.ManageAccount">
			<result column="operate_id" property="id" jdbcType="INTEGER"/>
			<result column="operate_name" property="userName" jdbcType="VARCHAR"/>
			</collection>

			<!--行业-->
			<collection property="professions" ofType="java.util.HashMap">
			<result column="profession_key" property="dataKey" jdbcType="INTEGER"/>
			<result column="profession_value" property="dataValue" jdbcType="VARCHAR"/>
			</collection>
			</resultMap>

			@@ -134,7 +137,8 @@
			v.id version_id,
			v.`name` version_name,
			ma.user_name operate_name,
			profession.dataValue profession_name,
			profession.dataKey profession_key,
			profession.dataValue profession_value,
			tech.dataValue tech_name,
			detector.dataValue detector_name,
			purchaser.dataValue purchaser_name
			@@ -160,7 +164,10 @@
			WHERE sdt.id = sdd.dict_type_id
			AND sdt.`name` = 'profession'
			) profession
			ON d.profession = profession.dataKey
			ON FIND_IN_SET
			(
			profession.dataKey, (SELECT profession FROM device WHERE id = d.id)
			)

			LEFT JOIN
			(