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

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/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