bug修复

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -230,4 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update ms_sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
-</mapper> 
+	<select id="selectDeptByName" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where dept_name=#{deptName}  and del_flag = '0' limit 1
+	</select>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			from ms_sys_user u
 			left join ms_sys_user_role ur on u.user_id = ur.user_id
 			left join ms_sys_role r on r.role_id = ur.role_id
-		where u.eamil = #{eamil} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
+		where u.email = #{email} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
 	</select>
     <select id="selectByDeptIdAndRole" resultMap="SysUserResult">
 		select u.* from

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml

@@ -54,7 +54,7 @@
                 LEFT JOIN ms_sys_role r ON r.role_id = ur.role_id
                 LEFT JOIN ms_sys_dept d ON d.dept_id = a.applicant_dept_id
         where  c.id = #{id}
-        GROUP BY a.id
+        GROUP BY a.id order by a.id asc
     </select>
     <select id="selectUserRoleByCaseIds" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
         select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml

@@ -16,6 +16,7 @@
         <result property="createBy"   column="create_by"  />
         <result property="updateBy"   column="update_by"  />
         <result property="sendStatus"   column="send_status"  />
+        <result property="sid"   column="sid"  />
     </resultMap>
     <insert id="saveSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" useGeneratedKeys="true" keyProperty="id">
 
@@ -27,6 +28,8 @@
         <if test="sendContent != null ">send_content,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="sendStatus != null ">send_status,</if>
+        sid,
+        reason,
         create_time
         )values(
         <if test="caseId != null ">#{caseId},</if>
@@ -36,6 +39,8 @@
         <if test="sendContent != null ">#{sendContent},</if>
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
         <if test="sendStatus != null ">#{sendStatus},</if>
+        #{sid},
+        #{reason},
         sysdate()
         )
     </insert>
@@ -49,7 +54,8 @@
        send_content,
        create_by,
        send_status,
-        create_time
+        create_time,
+        sid,reason
         )values
         <foreach item="item" index="index" collection="list" separator=",">
         (
@@ -60,14 +66,14 @@
         #{item.sendContent},
         #{item.createBy},
         #{item.sendStatus},
-        sysdate()
+        sysdate(),#{sid},#{reason}
         )
         </foreach>
     </insert>
 
     <select id="getSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" resultMap="SmsSendRecordResult">
 
-        select id ,case_appli_id ,case_num ,phone ,send_time ,send_content,send_status
+        select *
         from ms_sms_send_record
         <where>
             <if test="caseNum != null and caseNum != ''">
@@ -76,5 +82,14 @@
         </where>
         order by send_time desc
     </select>
+
+    <select id="selectBySId" resultMap="SmsSendRecordResult">
+        select  * from ms_sms_send_record where sid=#{sid}
+    </select>
+
+    <update id="updateStatus">
+        update ms_sms_send_record
+       set send_status= #{sendStatus} ,reason=#{reason} where sid=#{sid}
+    </update>
 </mapper>