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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java

@@ -304,8 +304,8 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
             return AjaxResult.error("信息重复");
         }
         deptIdentify.setIdentifyStatus(0); //设置认证状态默认为未认证
-        deptIdentify.setIsUse(0); //设置认证状态默认为未认证
-        int i = deptIdentifyMapper.insertDeptIdentify(deptIdentify);//设置机构默认为未启用
+        deptIdentify.setIsUse(0); //设置机构默认为未启用
+        int i = deptIdentifyMapper.insertDeptIdentify(deptIdentify);
         if (i > 0) {
             return AjaxResult.success("新增成功");
         }

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

@@ -13,6 +13,7 @@
         <result property="identifyName"     column="identify_name"     />
         <result property="operName"     column="oper_name"     />
         <result property="operPhone"     column="oper_phone"     />
+        <result property="identifyType"     column="identify_type"     />
 
     </resultMap>
 
@@ -47,21 +48,25 @@
 
     <insert id="insertDeptIdentify" parameterType="DeptIdentify" useGeneratedKeys="true" keyProperty="id">
         insert into dept_identify(
-        <if test="deptId != null">dept_id,</if>
-        <if test="userId != null">user_id,</if>
+        <if test="identifyName != null and identifyName != ''">identify_name,</if>
         <if test="identifyStatus != null">identify_status,</if>
         <if test="identifyDate != null">identify_date,</if>
         <if test="isUse != null">is_use,</if>
         <if test="orgId != null and orgId != ''">org_id,</if>
-        <if test="authFlowId != null and authFlowId != ''">auth_flow_id</if>
+        <if test="operName != null and operName != ''">oper_name,</if>
+        <if test="operPhone != null and operPhone != ''">oper_phone,</if>
+        <if test="authFlowId != null and authFlowId != ''">auth_flow_id,</if>
+        <if test="identifyType != null">identify_type</if>
         )values(
-        <if test="deptId != null">#{deptId},</if>
-        <if test="userId != null">#{userId},</if>
+        <if test="identifyName != null and identifyName != ''">#{identifyName},</if>
         <if test="identifyStatus != null">#{identifyStatus},</if>
         <if test="identifyDate != null">#{identifyDate},</if>
         <if test="isUse != null">#{isUse},</if>
         <if test="orgId != null and orgId != ''">#{orgId},</if>
-        <if test="authFlowId != null and authFlowId != '' ">#{authFlowId}</if>
+        <if test="operName != null and operName != ''">#{operName},</if>
+        <if test="operPhone != null and operPhone != ''">#{operPhone},</if>
+        <if test="authFlowId != null and authFlowId != '' ">#{authFlowId},</if>
+        <if test="identifyType != null ">#{identifyType}</if>
         )
     </insert>