18792927508 2 gadus atpakaļ
vecāks
revīzija
80f072efd3

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Parādīt failu

331
                     // 生成调解申请书
331
                     // 生成调解申请书
332
                         req.setTemplateId(String.valueOf(templateManage.getId()));
332
                         req.setTemplateId(String.valueOf(templateManage.getId()));
333
                     // todo 部署放开
333
                     // todo 部署放开
334
-                    caseApplicationService.generateApplication(req);
334
+             //       caseApplicationService.generateApplication(req);
335
 
335
 
336
                 }
336
                 }
337
 
337
 

+ 2
- 2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml Parādīt failu

24
         <result property="updateTime"   column="update_time"  />
24
         <result property="updateTime"   column="update_time"  />
25
         <result property="remark"       column="remark"       />
25
         <result property="remark"       column="remark"       />
26
         <result property="specialty"       column="specialty"       />
26
         <result property="specialty"       column="specialty"       />
27
-        <collection property="dept"    javaType="com.ruoyi.common.core.domain.entity.SysDept"         resultMap="deptResult" />
27
+<!--        <collection property="dept"    javaType="com.ruoyi.common.core.domain.entity.SysDept"         resultMap="deptResult" />-->
28
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
28
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
29
     </resultMap>
29
     </resultMap>
30
 	
30
 	
176
 		where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
176
 		where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
177
 	</select>
177
 	</select>
178
 	<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
178
 	<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
179
-		select u.*,d.dept_name,ur.role_id
179
+		select u.*,ur.role_id
180
 			from ms_sys_user u
180
 			from ms_sys_user u
181
 			left join ms_sys_user_role ur on u.user_id = ur.user_id
181
 			left join ms_sys_user_role ur on u.user_id = ur.user_id
182
 			left join ms_sys_role r on r.role_id = ur.role_id
182
 			left join ms_sys_role r on r.role_id = ur.role_id