系统机构：修改自发布企业保存对应字段

happy-job-base-common/src/main/java/com/jeeplus/modules/sys/mapper/xml/OfficeMapper.xml

@@ -1,278 +1,278 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeeplus.modules.sys.mapper.OfficeMapper">
-	
-	<resultMap id="officeResult" type="Office">
-    	<id property="id" column="id" />
-		<result property="parentIds" column="parent_ids" />
-		<result property="name" column="name" />
-		<result property="code" column="code" />
-		<result property="type" column="type" />
-		<result property="grade" column="grade" />
-		<result property="address" column="address" />
-		<result property="zipCode" column="zip_code" />
-		<result property="master" column="master" />
-		<result property="phone" column="phone" />
-		<result property="fax" column="fax" />
-		<result property="email" column="email" />
-		<result property="useable" column="useable" />
-		<result property="type" column="type" />
-		<result property="remarks" column="remarks" />
-		<result property="isThirdParty" column="is_third_party" />
-		<result property="isSelfPublish" column="is_self_publish" />
-		<association property="dpEnterpriseAuthenticationSys" column="self_publish_enterprise_id" select="getDp" />
-		<association property="area" column="area_id" select="getArea" />
-		<association property="hasChildren" column="id" select="hasChildren" />
-    </resultMap>
-
-
-
-	<sql id="officeColumns">
-		a.id,
-		a.parent_id AS "parent.id",
-		a.parent_ids,
-		a.area_id AS "area.id",
-		a.code,
-		a.name,
-		a.sort,
-		a.type,
-		a.grade,
-		a.address, 
-		a.zip_code, 
-		a.master, 
-		a.phone, 
-		a.fax, 
-		a.email, 
-		a.remarks,
-		a.is_third_party AS "isThirdParty",
-		a.is_self_publish AS "isSelfPublish",
-		a.self_publish_enterprise_id AS "dpEnterpriseAuthenticationSys.id",
-		a.create_by AS "createBy.id",
-		a.create_date,
-		a.update_by AS "updateBy.id",
-		a.update_date,
-		a.del_flag,
-		a.useable AS useable,
-		a.primary_person AS "primaryPerson.id",
-		a.deputy_person AS "deputyPerson.id",
-		p.name AS "parent.name",
-		ar.name AS "area.name",
-		ar.parent_ids AS "area.parentIds",
-		pp.name AS "primaryPerson.name",
-		dp.name AS "deputyPerson.name",
-		dpe.enterprise_name AS "dpEnterpriseAuthenticationSys.enterpriseName"
-	</sql>
-	
-	<sql id="officeJoins">
-		LEFT JOIN sys_office p ON p.id = a.parent_id
-		LEFT JOIN sys_area ar ON ar.id = a.area_id
-		LEFT JOIN sys_user pp ON pp.id = a.primary_person
-		LEFT JOIN sys_user dp ON dp.id = a.deputy_person
-		LEFT JOIN dp_enterprise_authentication dpe ON dpe.id = a.self_publish_enterprise_id
-    </sql>
-    
-	<select id="getChildren" parameterType="String" resultMap="officeResult">  
-        select * from sys_office where parent_id = #{id} ORDER BY sort
-    </select>
-	<select id="getThirdChildren" resultMap="officeResult">
-        select * from sys_office where parent_id = #{id} and is_third_party = #{isThirdParty} ORDER BY sort
-    </select>
-	<select id="getArea" parameterType="String" resultType="Area">
-        select * from sys_area where id = #{id} 
-    </select> 
-    
-	<select id="hasChildren" parameterType="String" resultType="Boolean">  
-        select case when exists(select 1 from sys_office where parent_id = #{id}) then 1 else 0 end ${dual}
-    </select>
-    
-	<select id="get" resultType="Office">
-		SELECT
-			<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="getByCode" resultType="Office">
-		SELECT
-			<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		
-		WHERE a.code = #{code}
-	</select>
-	<select id="findList" resultType="Office">
-		SELECT
-			<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		<!-- 数据范围过滤 -->
-		${dataScope}
-        <if test="name != null and name != ''">
-            AND a.name = #{name}
-        </if>
-		ORDER BY a.code
-	</select>
-
-	<select id="findThirdList" resultType="Office">
-		SELECT
-		<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		<!-- 数据范围过滤 -->
-		${dataScope}
-		<if test="name != null and name != ''">
-			AND a.name = #{name}
-		</if>
-		<if test="isThirdParty != null">
-			AND a.is_third_party = #{isThirdParty}
-		</if>
-		ORDER BY a.code
-	</select>
-			
-	<select id="findAllList" resultType="Office">
-		SELECT
-			<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		<!-- 数据范围过滤 -->
-		${dataScope}
-		ORDER BY a.code
-	</select>
-	
-	<select id="findByParentIdsLike" resultType="Office">
-		SELECT
-			<include refid="officeColumns"/>
-		FROM sys_office a
-		<include refid="officeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
-		ORDER BY a.code
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO sys_office(
-			id, 
-			parent_id, 
-			parent_ids, 
-			area_id, 
-			code, 
-			name, 
-			sort, 
-			type, 
-			grade, 
-			address, 
-			zip_code, 
-			master, 
-			phone, 
-			fax, 
-			email, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks,
-			is_third_party,
-			is_self_publish,
-			self_publish_enterprise_id,
-			del_flag,
-			useable,
-			primary_person,
-			deputy_person
-		) VALUES (
-			#{id}, 
-			#{parent.id}, 
-			#{parentIds}, 
-			#{area.id}, 
-			#{code}, 
-			#{name}, 
-			#{sort}, 
-			#{type}, 
-			#{grade}, 
-			#{address}, 
-			#{zipCode}, 
-			#{master}, 
-			#{phone}, 
-			#{fax}, 
-			#{email}, 
-			#{createBy.id}, 
-			#{createDate}, 
-			#{updateBy.id}, 
-			#{updateDate}, 
-			#{remarks},
-			#{isThirdParty},
-			#{isSelfPublish},
-			#{dpEnterpriseAuthenticationSys.id},
-			#{delFlag},
-			#{useable},
-			#{primaryPerson.id},
-			#{deputyPerson.id}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE sys_office SET 
-			parent_id = #{parent.id}, 
-			parent_ids = #{parentIds}, 
-			area_id = #{area.id}, 
-			code = #{code}, 
-			name = #{name}, 
-			type = #{type}, 
-			grade = #{grade}, 
-			address = #{address}, 
-			zip_code = #{zipCode}, 
-			master = #{master}, 
-			phone = #{phone}, 
-			fax = #{fax}, 
-			email = #{email}, 
-			update_by = #{updateBy.id}, 
-			update_date = #{updateDate}, 
-			remarks = #{remarks},
-			is_third_party = #{isThirdParty},
-			is_self_publish = #{isSelfPublish},
-			self_publish_enterprise_id = #{dpEnterpriseAuthenticationSys.id},
-			useable=#{useable},
-			primary_person=#{primaryPerson.id},
-			deputy_person=#{deputyPerson.id}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="updateParentIds">
-		UPDATE sys_office SET 
-			parent_id = #{parent.id}, 
-			parent_ids = #{parentIds}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="delete">
-		DELETE FROM sys_office 
-		WHERE id = #{id} OR parent_ids LIKE 
-					<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
-					<if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
-					<if test="dbName == 'mssql'">'%'+#{id}+'%'</if>
-	</update>
-	
-	<update id="deleteByLogic">
-		UPDATE sys_office SET 
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id} OR parent_ids LIKE 
-					<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
-					<if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
-					<if test="dbName == 'mssql'">'%'+#{id}+'%'</if>
-	</update>
-
-	<select id="getDpEnterpriseTreeData" resultType="DpEnterpriseAuthenticationSys">
-		select a.*
-		from dp_enterprise_authentication a
-		where a.authentication_status = 3
-	</select>
-
-	<select id="getDp" parameterType="String" resultType="DpEnterpriseAuthenticationSys">
-		select a.*
-		from dp_enterprise_authentication a
-		where a.id = #{id}
-	</select>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sys.mapper.OfficeMapper">
+	
+	<resultMap id="officeResult" type="Office">
+    	<id property="id" column="id" />
+		<result property="parentIds" column="parent_ids" />
+		<result property="name" column="name" />
+		<result property="code" column="code" />
+		<result property="type" column="type" />
+		<result property="grade" column="grade" />
+		<result property="address" column="address" />
+		<result property="zipCode" column="zip_code" />
+		<result property="master" column="master" />
+		<result property="phone" column="phone" />
+		<result property="fax" column="fax" />
+		<result property="email" column="email" />
+		<result property="useable" column="useable" />
+		<result property="type" column="type" />
+		<result property="remarks" column="remarks" />
+		<result property="isThirdParty" column="is_third_party" />
+		<result property="isSelfPublish" column="is_self_publish" />
+		<association property="dpEnterpriseAuthenticationSys" column="self_publish_enterprise_id" select="getDp" />
+		<association property="area" column="area_id" select="getArea" />
+		<association property="hasChildren" column="id" select="hasChildren" />
+    </resultMap>
+
+
+
+	<sql id="officeColumns">
+		a.id,
+		a.parent_id AS "parent.id",
+		a.parent_ids,
+		a.area_id AS "area.id",
+		a.code,
+		a.name,
+		a.sort,
+		a.type,
+		a.grade,
+		a.address, 
+		a.zip_code, 
+		a.master, 
+		a.phone, 
+		a.fax, 
+		a.email, 
+		a.remarks,
+		a.is_third_party AS "isThirdParty",
+		a.is_self_publish AS "isSelfPublish",
+		a.self_publish_enterprise_id AS "dpEnterpriseAuthenticationSys.id",
+		a.create_by AS "createBy.id",
+		a.create_date,
+		a.update_by AS "updateBy.id",
+		a.update_date,
+		a.del_flag,
+		a.useable AS useable,
+		a.primary_person AS "primaryPerson.id",
+		a.deputy_person AS "deputyPerson.id",
+		p.name AS "parent.name",
+		ar.name AS "area.name",
+		ar.parent_ids AS "area.parentIds",
+		pp.name AS "primaryPerson.name",
+		dp.name AS "deputyPerson.name",
+		dpe.enterprise_name AS "dpEnterpriseAuthenticationSys.enterpriseName"
+	</sql>
+	
+	<sql id="officeJoins">
+		LEFT JOIN sys_office p ON p.id = a.parent_id
+		LEFT JOIN sys_area ar ON ar.id = a.area_id
+		LEFT JOIN sys_user pp ON pp.id = a.primary_person
+		LEFT JOIN sys_user dp ON dp.id = a.deputy_person
+		LEFT JOIN dp_enterprise_authentication dpe ON dpe.id = a.self_publish_enterprise_id
+    </sql>
+    
+	<select id="getChildren" parameterType="String" resultMap="officeResult">  
+        select * from sys_office where parent_id = #{id} ORDER BY sort
+    </select>
+	<select id="getThirdChildren" resultMap="officeResult">
+        select * from sys_office where parent_id = #{id} and is_third_party = #{isThirdParty} ORDER BY sort
+    </select>
+	<select id="getArea" parameterType="String" resultType="Area">
+        select * from sys_area where id = #{id} 
+    </select> 
+    
+	<select id="hasChildren" parameterType="String" resultType="Boolean">  
+        select case when exists(select 1 from sys_office where parent_id = #{id}) then 1 else 0 end ${dual}
+    </select>
+    
+	<select id="get" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="getByCode" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		
+		WHERE a.code = #{code}
+	</select>
+	<select id="findList" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		<!-- 数据范围过滤 -->
+		${dataScope}
+        <if test="name != null and name != ''">
+            AND a.name = #{name}
+        </if>
+		ORDER BY a.code
+	</select>
+
+	<select id="findThirdList" resultType="Office">
+		SELECT
+		<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		<!-- 数据范围过滤 -->
+		${dataScope}
+		<if test="name != null and name != ''">
+			AND a.name = #{name}
+		</if>
+		<if test="isThirdParty != null">
+			AND a.is_third_party = #{isThirdParty}
+		</if>
+		ORDER BY a.code
+	</select>
+			
+	<select id="findAllList" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		<!-- 数据范围过滤 -->
+		${dataScope}
+		ORDER BY a.code
+	</select>
+	
+	<select id="findByParentIdsLike" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
+		ORDER BY a.code
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO sys_office(
+			id, 
+			parent_id, 
+			parent_ids, 
+			area_id, 
+			code, 
+			name, 
+			sort, 
+			type, 
+			grade, 
+			address, 
+			zip_code, 
+			master, 
+			phone, 
+			fax, 
+			email, 
+			create_by, 
+			create_date, 
+			update_by, 
+			update_date, 
+			remarks,
+			is_third_party,
+			is_self_publish,
+			self_publish_enterprise_id,
+			del_flag,
+			useable,
+			primary_person,
+			deputy_person
+		) VALUES (
+			#{id}, 
+			#{parent.id}, 
+			#{parentIds}, 
+			#{area.id}, 
+			#{code}, 
+			#{name}, 
+			#{sort}, 
+			#{type}, 
+			#{grade}, 
+			#{address}, 
+			#{zipCode}, 
+			#{master}, 
+			#{phone}, 
+			#{fax}, 
+			#{email}, 
+			#{createBy.id}, 
+			#{createDate}, 
+			#{updateBy.id}, 
+			#{updateDate}, 
+			#{remarks},
+			#{isThirdParty},
+			#{isSelfPublish},
+			#{selfPublishEnterpriseId},
+			#{delFlag},
+			#{useable},
+			#{primaryPerson.id},
+			#{deputyPerson.id}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE sys_office SET 
+			parent_id = #{parent.id}, 
+			parent_ids = #{parentIds}, 
+			area_id = #{area.id}, 
+			code = #{code}, 
+			name = #{name}, 
+			type = #{type}, 
+			grade = #{grade}, 
+			address = #{address}, 
+			zip_code = #{zipCode}, 
+			master = #{master}, 
+			phone = #{phone}, 
+			fax = #{fax}, 
+			email = #{email}, 
+			update_by = #{updateBy.id}, 
+			update_date = #{updateDate}, 
+			remarks = #{remarks},
+			is_third_party = #{isThirdParty},
+			is_self_publish = #{isSelfPublish},
+			self_publish_enterprise_id = #{selfPublishEnterpriseId},
+			useable=#{useable},
+			primary_person=#{primaryPerson.id},
+			deputy_person=#{deputyPerson.id}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="updateParentIds">
+		UPDATE sys_office SET 
+			parent_id = #{parent.id}, 
+			parent_ids = #{parentIds}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM sys_office 
+		WHERE id = #{id} OR parent_ids LIKE 
+					<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
+					<if test="dbName == 'mssql'">'%'+#{id}+'%'</if>
+	</update>
+	
+	<update id="deleteByLogic">
+		UPDATE sys_office SET 
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id} OR parent_ids LIKE 
+					<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
+					<if test="dbName == 'mssql'">'%'+#{id}+'%'</if>
+	</update>
+
+	<select id="getDpEnterpriseTreeData" resultType="DpEnterpriseAuthenticationSys">
+		select a.*
+		from dp_enterprise_authentication a
+		where a.authentication_status = 3
+	</select>
+
+	<select id="getDp" parameterType="String" resultType="DpEnterpriseAuthenticationSys">
+		select a.*
+		from dp_enterprise_authentication a
+		where a.id = #{id}
+	</select>
+
 </mapper>

happy-job-base-system/src/main/webapp/webpage/modules/sys/office/officeForm.jsp

@@ -93,9 +93,9 @@
 						  <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					  </form:select>
 				  </td>
-				  <td  class="width-15 active"><label class="pull-right"><font color="red">*</font>自发布企业:</label></td>
+				  <td  class="width-15 active"><label class="pull-right">自发布企业:</label></td>
 				  <td class="width-35">
-					  <sys:treeselect id="dpEnterpriseAuthenticationSys" name="dpEnterpriseAuthenticationSys.id" value="${office.dpEnterpriseAuthenticationSys.id}" labelName="dpEnterpriseAuthenticationSys.name" labelValue="${office.dpEnterpriseAuthenticationSys.enterpriseName}"
+					  <sys:treeselect id="selfPublishEnterpriseId" name="selfPublishEnterpriseId" value="${office.dpEnterpriseAuthenticationSys.id}" labelName="dpEnterpriseAuthenticationSys.name" labelValue="${office.dpEnterpriseAuthenticationSys.enterpriseName}"
 									  title="自发布企业" allowClear="true" url="/sys/office/dpEnterpriseTreeData" cssClass="form-control"/>
 				  </td>
 			  </tr>