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

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

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserListByIds(@Param("idList") List<Long> idList);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitratorMapper.java

 public interface ArbitratorMapper {
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

 package com.ruoyi.wisdomarbitrate.mapper;
 
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import org.apache.ibatis.annotations.Param;
      * @return
      */
     Integer selectCaseNumLike(@Param("caseNum") String caseNum, @Param("length") int length);
+
+    /**
+     * 查询仲裁员根据案件id
+     * @param arbitrator
+     * @return
+     */
+    String selectArbitratorList(@Param("id") String id);
 }

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

 			</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">

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

         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>