Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/DeptIdentify.java

@@ -47,6 +47,9 @@ public class DeptIdentify  extends BaseEntity {
     /** 机构类型(1 仲裁机构) */
     private Integer identifyType;
 
+    /** 机构邮箱 */
+    private String identifyEmail;
+
 
     /** 删除标志（0代表存在 2代表删除） */
     private Integer delFlag;

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml

@@ -18,13 +18,14 @@
         <result property="creditCode"     column="credit_code"     />
         <result property="legalPerName"     column="legal_per_name"     />
         <result property="legalPerPhone"     column="legal_per_phone"     />
+        <result property="identifyEmail"     column="identify_email"     />
 
     </resultMap>
 
 
     <select id="selectDeptIdentify" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
         SELECT  id, identify_name ,identify_status , identify_date,is_use,org_id,auth_flow_id,
-                oper_name,oper_phone,identify_type,credit_code,legal_per_name,legal_per_phone
+                oper_name,oper_phone,identify_type,credit_code,legal_per_name,legal_per_phone,identify_email
         FROM  dept_identify
         <where>
             <if test="id != null">
@@ -65,6 +66,7 @@
         <if test="creditCode != null and creditCode != ''">credit_code,</if>
         <if test="legalPerName != null and legalPerName != ''">legal_per_name,</if>
         <if test="legalPerPhone != null and legalPerPhone != ''">legal_per_phone,</if>
+        <if test="identifyEmail != null and identifyEmail != ''">identify_email,</if>
         del_flag
         )values(
         <if test="identifyName != null and identifyName != ''">#{identifyName},</if>
@@ -79,6 +81,7 @@
         <if test="creditCode != null and creditCode != '' ">#{creditCode},</if>
         <if test="legalPerName != null and legalPerName != '' ">#{legalPerName},</if>
         <if test="legalPerPhone != null and legalPerPhone != '' ">#{legalPerPhone},</if>
+        <if test="identifyEmail != null and identifyEmail != '' ">#{identifyEmail},</if>
         0
         )
     </insert>
@@ -97,11 +100,12 @@
             <if test="identifyStatus != null ">identify_status = #{identifyStatus},</if>
             <if test="orgId != null  and orgId != ''">org_id = #{orgId},</if>
             <if test="delFlag != null ">del_flag = #{delFlag},</if>
-            <if test="operName != null ">oper_name = #{operName},</if>
+            <if test="operName != null  and operName != ''">oper_name = #{operName},</if>
-            <if test="operPhone != null ">oper_phone = #{operPhone},</if>
+            <if test="operPhone != null and operPhone != ''">oper_phone = #{operPhone},</if>
-            <if test="creditCode != null ">credit_code = #{creditCode},</if>
+            <if test="creditCode != null and creditCode != ''">credit_code = #{creditCode},</if>
-            <if test="legalPerName != null ">legal_per_name = #{legalPerName},</if>
+            <if test="legalPerName != null and legalPerName != ''">legal_per_name = #{legalPerName},</if>
-            <if test="legalPerPhone != null ">legal_per_phone = #{legalPerPhone},</if>
+            <if test="legalPerPhone != null and legalPerPhone != ''">legal_per_phone = #{legalPerPhone},</if>
+            <if test="identifyEmail != null and identifyEmail != ''">identify_email = #{identifyEmail},</if>
             <if test="authFlowId != null  and authFlowId != '' ">auth_flow_id = #{authFlowId}</if>
         </set>
         <where>