Merge branch 'master' into fu-dev

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/SysOperLogVO.java

@@ -63,6 +63,16 @@ public class SysOperLogVO extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
     /** 执行开始时间 */
     private Date startTime;
 
@@ -235,6 +245,26 @@ public class SysOperLogVO extends BaseEntity
         this.operTime = operTime;
     }
 
+    public Integer getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Integer getTenantId()
+    {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId)
+    {
+        this.tenantId = tenantId;
+    }
+
     public Date getStartTime() {return startTime;}
 
     public void setStartTime(Date startTime) {this.startTime = startTime;}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java

@@ -33,10 +33,14 @@ public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper,
     @Override
     public void insertOperlog(SysOperLog operLog)
     {
-        operLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
+        if(operLog.getDeptId() == null){
+            operLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
+        }
         operLog.setCreateBy(operLog.getOperName());
 
-        operLog.setTenantId(SecurityUtils.getTenantId());
+        if(operLog.getTenantId() == null){
+            operLog.setTenantId(SecurityUtils.getTenantId());
+        }
         Date now = new Date();
         operLog.setOperTime(now);
         operLogMapper.insertOperlog(operLog);

usky-common/usky-common-log/src/main/java/com/usky/common/log/aspect/LogAspect.java

@@ -90,6 +90,10 @@ public class LogAspect {
             operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
             // 处理设置注解上的参数
             getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+
+            operLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
+            operLog.setTenantId(SecurityUtils.getTenantId());
+
             // 记录开始时间、结束时间与耗时
             operLog.setStartTime(startTime);
             operLog.setEndTime(endTime);