Merge branch 'system-zyj' into system-165

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/mapper/SysUserMapper.java

@@ -171,6 +171,8 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
 
     public List<SysUser> userAllList();
 
+    public List<SysUser> tenantIdUserList(@Param("tenantId") Integer tenantId);
+
     /**
      * 查询mce_mbuser消息中心_移动端注册表对应的userId记录
      */

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

@@ -18,6 +18,7 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.RemoteUserService;
 import com.usky.system.domain.*;
 import com.usky.system.mapper.MceReceiveMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,9 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
     @Autowired
     private ISysDictDataService sysDictDataService;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
     @Override
     public CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer id, Integer current, Integer size) {
         List<Object> list = new ArrayList<>();
@@ -239,7 +243,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         if (!mceReceiveVO.containsKey("infoTypeName")) {
             mceReceiveVO.put("infoTypeName",infoTypeName);
         }
-        List<SysUser> list = iSysUserService.userAllList();
+        List<SysUser> list = userMapper.tenantIdUserList(SecurityUtils.getTenantId());
         MceContent mceContent = new MceContent();
         Integer contentId = 0;
         if (CollectionUtils.isNotEmpty(list)) {

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);

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

@@ -316,6 +316,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by user_id desc
 	</select>
 
+	<select id="tenantIdUserList" resultType="com.usky.system.domain.SysUser">
+		SELECT * FROM sys_user
+		where
+		del_flag=0 and status=0
+		<if test="tenantId != null and tenantId != 0">
+			and tenant_id = #{tenantId}
+		</if>
+		order by user_id desc
+	</select>
+
 	<select id="selectUserData" resultMap="SysUserResult">
 		select * from sys_user
 		where

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);