RuoYi пре 2 година
родитељ
комит
24e0fa863e

+ 2 - 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java

@@ -28,13 +28,13 @@ public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogServic
28
             @Override
28
             @Override
29
             public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
29
             public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
30
             {
30
             {
31
-                return null;
31
+                return R.fail("保存操作日志失败:" + throwable.getMessage());
32
             }
32
             }
33
 
33
 
34
             @Override
34
             @Override
35
             public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
35
             public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
36
             {
36
             {
37
-                return null;
37
+                return R.fail("保存登录日志失败:" + throwable.getMessage());
38
             }
38
             }
39
         };
39
         };
40
 
40
 

+ 3 - 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
23
         <result property="updateBy"     column="update_by"    />
23
         <result property="updateBy"     column="update_by"    />
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
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
27
-        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
26
+        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
27
+        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
28
     </resultMap>
28
     </resultMap>
29
 	
29
 	
30
     <resultMap id="deptResult" type="SysDept">
30
     <resultMap id="deptResult" type="SysDept">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
42
         <result property="roleName"     column="role_name"      />
42
         <result property="roleName"     column="role_name"      />
43
         <result property="roleKey"      column="role_key"       />
43
         <result property="roleKey"      column="role_key"       />
44
         <result property="roleSort"     column="role_sort"      />
44
         <result property="roleSort"     column="role_sort"      />
45
-        <result property="dataScope"     column="data_scope"    />
45
+        <result property="dataScope"    column="data_scope"     />
46
         <result property="status"       column="role_status"    />
46
         <result property="status"       column="role_status"    />
47
     </resultMap>
47
     </resultMap>
48
 	
48