Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml

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

@@ -141,7 +141,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+	<select id="selectUserListByAdRole" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from sys_user u
+		 join sys_user_role ur on ur.user_id =u.user_id
+		    join sys_role r on ur.role_id = r.role_id and r.role_name='仲裁员'
+		where r.del_flag = '0' and r.status='0'
+		and u.del_flag = '0' and u.status='0'
+			<if test="arbitratorName != null and arbitratorName != ''">
+				AND u.nick_name like concat('%', #{arbitratorName}, '%')
+			</if>
+
+			<if test="idList != null and idList.size() > 0">
+				AND u.user_id in
+				<foreach item="id" collection="idList" open="(" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
+
+
+	</select>
+	<select id="selectUserListByIds" resultMap="SysUserResult">
+		select u.user_id,  u.nick_name, u.user_name, u.phonenumber, u.remark from sys_user u
+
+			<where>
+		<if test="idList != null and idList.size() > 0">
+			AND u.user_id in
+			<foreach item="id" collection="idList" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+		</if>
+			</where>
+
+
+	</select>
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>

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

@@ -248,6 +248,9 @@
         select max(substring(case_num, #{length}+1,12)+1) as maxCaseNum
         from case_application where case_num like CONCAT(#{caseNum},'%') ;
     </select>
+    <select id="selectArbitratorList" resultType="java.lang.String">
+        select a.arbitrator_id  id from case_application a where a.id=#{id}
+    </select>
 
 
 </mapper>

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

@@ -12,4 +12,5 @@
         ,#{orgnizeNamePsnAccount},#{orgnizeNamepsnName},#{positionPagepsn},#{positionXpsn},#{positionYpsn}
         ,#{positionPageorg},#{positionXorg},#{positionYorg},#{caseAppliId},#{signFlowStatus})
     </insert>
+
 </mapper>