Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysLogininfor.java

@@ -35,6 +35,16 @@ public class SysLogininfor
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
     public String getSearchValue() {
         return searchValue;
     }
@@ -122,4 +132,24 @@ public class SysLogininfor
     {
         this.accessTime = accessTime;
     }
+
+    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;
+    }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java

@@ -70,6 +70,16 @@ public class SysOperLog
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
     public String getSearchValue() {
         return searchValue;
     }
@@ -268,4 +278,24 @@ public class SysOperLog
     {
         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;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysLogininfor;
 import com.usky.system.mapper.SysLogininforMapper;
 import com.usky.system.service.ISysLogininforService;
@@ -32,6 +33,8 @@ public class SysLogininforServiceImpl extends AbstractCrudService<SysLogininforM
     @Override
     public void insertLogininfor(SysLogininfor logininfor)
     {
+        logininfor.setDeptId(SecurityUtils.getLoginUser().getSysPerson().getDeptId().intValue());
+        logininfor.setTenantId(SecurityUtils.getTenantId());
         logininforMapper.insertLogininfor(logininfor);
     }
 

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

@@ -2,6 +2,7 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysOperLog;
 import com.usky.system.mapper.SysOperLogMapper;
 import com.usky.system.service.ISysOperLogService;
@@ -30,6 +31,8 @@ public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper,
     @Override
     public void insertOperlog(SysOperLog operLog)
     {
+        operLog.setDeptId(SecurityUtils.getLoginUser().getSysPerson().getDeptId().intValue());
+        operLog.setTenantId(SecurityUtils.getTenantId());
         operLogMapper.insertOperlog(operLog);
     }
 

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -11,11 +11,13 @@
 		<result property="ipaddr"        column="ipaddr"            />
 		<result property="msg"           column="msg"               />
 		<result property="accessTime"    column="access_time"       />
+		<result property="deptId"        column="dept_id"           />
+		<result property="tenantId"      column="tenant_id"         />
 	</resultMap>
 
 	<insert id="insertLogininfor" parameterType="com.usky.system.domain.SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
+		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time, dept_id, tenant_id)
+		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate(), #{deptId}, #{tenantId})
 	</insert>
 
 	<select id="selectLogininforList" parameterType="com.usky.system.domain.SysLogininfor" resultMap="SysLogininforResult">

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="status"         column="status"         />
 		<result property="errorMsg"       column="error_msg"      />
 		<result property="operTime"       column="oper_time"      />
+		<result property="deptId"         column="dept_id"        />
+		<result property="tenantId"       column="tenant_id"      />
 	</resultMap>
 
 	<sql id="selectOperLogVo">
@@ -29,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
 	<insert id="insertOperlog" parameterType="com.usky.system.domain.SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
+		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, dept_id, tenant_id)
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate(), #{deptId}, #{tenantId})
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="com.usky.system.domain.SysOperLog" resultMap="SysOperLogResult">