SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #59.
This commit is contained in:
wangqiong123
2024-02-01 11:49:51 +08:00
committed by Gitea
parent a32e42dfea 80f072efd3
commit bae9acd9ad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+1 -1
View File
@@ -331,7 +331,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 生成调解申请书 // 生成调解申请书
req.setTemplateId(String.valueOf(templateManage.getId())); req.setTemplateId(String.valueOf(templateManage.getId()));
// todo 部署放开 // todo 部署放开
caseApplicationService.generateApplication(req); // caseApplicationService.generateApplication(req);
} }
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+2 -2
View File
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="specialty" column="specialty" /> <result property="specialty" column="specialty" />
<collection property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" /> <!-- <collection property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" />-->
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap> </resultMap>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1 where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
</select> </select>
<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult"> <select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
select u.*,d.dept_name,ur.role_id select u.*,ur.role_id
from ms_sys_user u from ms_sys_user u
left join ms_sys_user_role ur on u.user_id = ur.user_id 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 left join ms_sys_role r on r.role_id = ur.role_id