权限过滤功能

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssData.java

@@ -9,4 +9,5 @@ import cc.iotkit.model.system.SysOss;
  * @author sjg
  */
 public interface ISysOssData extends ICommonData<SysOss, Long> {
+
 }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java

@@ -1,18 +1,20 @@
 package cc.iotkit.data.model;
 
 import cc.iotkit.common.tenant.dao.TenantAware;
+import cc.iotkit.common.tenant.listener.TenantListener;
 import cc.iotkit.model.system.SysOss;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.ParamDef;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * OSS对象存储对象
@@ -20,11 +22,15 @@ import javax.persistence.Table;
  * @author Lion Li
  */
 @Data
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "sys_oss")
 @ApiModel(value = "OSS对象存储对象")
 @AutoMapper(target = SysOss.class)
+@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "string")})
+@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
+@EntityListeners(TenantListener.class)
 public class TbSysOss extends BaseEntity implements TenantAware {
 
     /**

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java

@@ -59,7 +59,7 @@ public class AlertConfigDataImpl implements IAlertConfigData, IJPACommData<Alert
     private Predicate buildPredicate(AlertConfig data) {
         return PredicateBuilder.instance()
                 .and(StringUtils.isNotEmpty(data.getLevel()), () -> tbAlertConfig.level.eq(data.getLevel()))
-                .and(StringUtils.isNotEmpty(data.getName()), () -> tbAlertConfig.name.like(data.getName()))
+                .and(StringUtils.isNotEmpty(data.getName()), () -> tbAlertConfig.name.like("%"+data.getName()+"%"))
                 .build();
     }
 

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductDataImpl.java

@@ -107,7 +107,7 @@ public class ProductDataImpl implements IProductData, IJPACommData<Product, Long
     private Predicate buildPredicate(Product data) {
         return PredicateBuilder.instance()
                 .and(StringUtils.isNotEmpty(data.getProductKey()), () -> tbProduct.productKey.eq(data.getProductKey()))
-                .and(StringUtils.isNotEmpty(data.getName()), () -> tbProduct.name.like(data.getName()))
+                .and(StringUtils.isNotEmpty(data.getName()), () -> tbProduct.name.like("%"+data.getName()+"%"))
 //                .and(StringUtils.isNotEmpty(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
                 .build();
     }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java

@@ -83,9 +83,9 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
     public Paging<SysConfig> findAll(PageRequest<SysConfig> pageRequest) {
         SysConfig query = pageRequest.getData();
         Predicate predicate = PredicateBuilder.instance()
-                .and(StringUtils.isNotEmpty(query.getConfigName()), () -> tbSysConfig.configName.like(query.getConfigName()))
+                .and(StringUtils.isNotEmpty(query.getConfigName()), () -> tbSysConfig.configName.like("%"+query.getConfigName()+"%"))
                 .and(StringUtils.isNotEmpty(query.getConfigType()), () -> tbSysConfig.configType.eq(query.getConfigType()))
-                .and(StringUtils.isNotEmpty(query.getConfigKey()), () -> tbSysConfig.configKey.like(query.getConfigKey()))
+                .and(StringUtils.isNotEmpty(query.getConfigKey()), () -> tbSysConfig.configKey.like("%"+query.getConfigKey()+"%"))
                 .build();
         Page<TbSysConfig> all = baseRepository.findAll(predicate, PageBuilder.toPageable(pageRequest));
         return  PageBuilder.toPaging(all, SysConfig.class);
@@ -136,7 +136,7 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
     private Predicate buildPredicate(SysConfig data) {
         return PredicateBuilder.instance()
                 .and(StringUtils.isNotEmpty(data.getConfigKey()), () -> tbSysConfig.configKey.eq(data.getConfigKey()))
-                .and(StringUtils.isNotEmpty(data.getConfigName()), () -> tbSysConfig.configName.like(data.getConfigName()))
+                .and(StringUtils.isNotEmpty(data.getConfigName()), () -> tbSysConfig.configName.like("%"+data.getConfigName()+"%"))
                 .and(StringUtils.isNotEmpty(data.getConfigType()), () -> tbSysConfig.configType.eq(data.getConfigType()))
                 .and(StringUtils.isNotEmpty(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
                 .build();

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDeptDataImpl.java

@@ -68,8 +68,8 @@ public class SysDeptDataImpl implements ISysDeptData, IJPACommData<SysDept, Long
         PredicateBuilder predicateBuilder = PredicateBuilder.instance()
                 .and(ObjectUtil.isNotNull(dept.getId()), () -> tbSysDept.id.eq(dept.getId()))
                 .and(ObjectUtil.isNotNull(dept.getParentId()), () -> tbSysDept.parentId.eq(dept.getParentId()))
-                .and(StringUtils.isNotEmpty(dept.getDeptName()), () -> tbSysDept.deptName.like(dept.getDeptName()))
-                .and(StringUtils.isNotEmpty(dept.getTenantId()), () -> tbSysDept.tenantId.like(dept.getTenantId()))
+                .and(StringUtils.isNotEmpty(dept.getDeptName()), () -> tbSysDept.deptName.like("%"+dept.getDeptName()+"%"))
+                .and(StringUtils.isNotEmpty(dept.getTenantId()), () -> tbSysDept.tenantId.eq(dept.getTenantId()))
                 .and(StringUtils.isNotEmpty(dept.getStatus()), () -> tbSysDept.status.eq(dept.getStatus()));
         checkDataPermission(predicateBuilder, TenantHelper.getTenantId());
         return MapstructUtils.convert(StreamSupport.stream(deptRepository.findAll(predicateBuilder.build()).spliterator(), false).collect(Collectors.toList()), SysDept.class);
@@ -116,19 +116,19 @@ public class SysDeptDataImpl implements ISysDeptData, IJPACommData<SysDept, Long
     }
 
     private void checkDataPermission(PredicateBuilder predicateBuilder, String tenantId){
-        Long deptId = LoginHelper.getDeptId();
-        List<Long> deptList = new ArrayList<>();
-        if(ObjectUtil.isNotNull(deptId)){
-           String ChildDept = RedisUtils.getCacheObject(GlobalConstants.DEPT_CHILD_PREFIX+tenantId+":"+LoginHelper.getDeptId());
-           if(StringUtils.isNotEmpty(ChildDept)){
-               deptList= Arrays.stream(StringUtils.split(ChildDept,",")).map(Long::parseLong).collect(Collectors.toList());
-               deptList.add(LoginHelper.getDeptId());
-           }else{
-               deptList = Collections.singletonList(LoginHelper.getDeptId());
-           }
-        }
-        List<Long> finalDeptList = deptList;
-        predicateBuilder.and(CollectionUtil.isNotEmpty(deptList),()->tbSysDept.id.in(finalDeptList));
+//        Long deptId = LoginHelper.getDeptId();
+//        List<Long> deptList = new ArrayList<>();
+//        if(ObjectUtil.isNotNull(deptId)){
+//           String ChildDept = RedisUtils.getCacheObject(GlobalConstants.DEPT_CHILD_PREFIX+tenantId+":"+LoginHelper.getDeptId());
+//           if(StringUtils.isNotEmpty(ChildDept)){
+//               deptList= Arrays.stream(StringUtils.split(ChildDept,",")).map(Long::parseLong).collect(Collectors.toList());
+//               deptList.add(LoginHelper.getDeptId());
+//           }else{
+//               deptList = Collections.singletonList(LoginHelper.getDeptId());
+//           }
+//        }
+        List<Long> finalDeptList = PredicateBuilder.queryCacheChildDeptIds(tenantId);
+        predicateBuilder.and(CollectionUtil.isNotEmpty(finalDeptList),()->tbSysDept.id.in(finalDeptList));
 
     }
 

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDictDataImpl.java

@@ -104,7 +104,7 @@ public class SysDictDataImpl implements ISysDictData, IJPACommData<SysDictData,
     private Predicate buildQueryCondition(SysDictData dictData) {
         return PredicateBuilder.instance()
                 .and(dictData.getDictSort() != null, () -> tbSysDictData.dictSort.eq(dictData.getDictSort()))
-                .and(StringUtils.isNotEmpty(dictData.getDictLabel()), () -> tbSysDictData.dictLabel.like(dictData.getDictLabel()))
+                .and(StringUtils.isNotEmpty(dictData.getDictLabel()), () -> tbSysDictData.dictLabel.like("%"+dictData.getDictLabel()+"%"))
                 .and(StringUtils.isNotEmpty(dictData.getDictType()), () -> tbSysDictData.dictType.eq(dictData.getDictType()))
                 .and(StringUtils.isNotEmpty(dictData.getStatus()), () -> tbSysDictData.status.eq(dictData.getStatus()))
                 .and(StringUtils.isNotEmpty(dictData.getTenantId()), () -> tbSysDictData.tenantId.eq(dictData.getTenantId())).build();

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDictTypeDataImpl.java

@@ -95,8 +95,8 @@ public class SysDictTypeDataImpl implements ISysDictTypeData, IJPACommData<SysDi
 
     private Predicate buildQueryCondition(SysDictType dictType) {
         return PredicateBuilder.instance()
-                .and(StringUtils.isNotEmpty(dictType.getDictName()), () -> tbSysDictType.dictName.like(dictType.getDictName()))
-                .and(StringUtils.isNotEmpty(dictType.getDictType()), () -> tbSysDictType.dictType.like(dictType.getDictType()))
+                .and(StringUtils.isNotEmpty(dictType.getDictName()), () -> tbSysDictType.dictName.like("%"+dictType.getDictName()+"%"))
+                .and(StringUtils.isNotEmpty(dictType.getDictType()), () -> tbSysDictType.dictType.like("%"+dictType.getDictType()+"%"))
                 .and(StringUtils.isNotEmpty(dictType.getStatus()), () -> tbSysDictType.status.eq(dictType.getStatus()))
                 .and(StringUtils.isNotEmpty(dictType.getTenantId()), () -> tbSysDictType.tenantId.eq(dictType.getTenantId())).build();
     }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java

@@ -78,9 +78,9 @@ public class SysLogininfoDataImpl implements ISysLogininforData, IJPACommData<Sy
     private static Predicate genPredicate(SysLoginInfo data) {
         PredicateBuilder predicateBuilder = PredicateBuilder.instance()
 //                .and(StringUtils.isNotBlank(data.getTenantId()),()->tbSysLogininfor.tenantId.eq(data.getTenantId()))
-                .and(StringUtils.isNotBlank(data.getIpaddr()), () -> tbSysLogininfor.ipaddr.like(data.getIpaddr()))
+                .and(StringUtils.isNotBlank(data.getIpaddr()), () -> tbSysLogininfor.ipaddr.like("%"+data.getIpaddr()+"%"))
                 .and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysLogininfor.status.eq(data.getStatus()))
-                .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysLogininfor.userName.like(data.getUserName()));
+                .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysLogininfor.userName.like("%"+data.getUserName()+"%"));
         //增加数据权限
         checkDataPermission(predicateBuilder, LoginHelper.getTenantId());
         return predicateBuilder.build();

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java

@@ -100,7 +100,7 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId, boolean isSuperAdmin) {
 
         PredicateBuilder predicateBuilder = PredicateBuilder.instance()
-                .and(StringUtils.isNotBlank(menu.getMenuName()), () -> tbSysMenu.menuName.like(menu.getMenuName()))
+                .and(StringUtils.isNotBlank(menu.getMenuName()), () -> tbSysMenu.menuName.like("%"+menu.getMenuName()+"%"))
                 .and(StringUtils.isNotBlank(menu.getVisible()), () -> tbSysMenu.visible.eq(menu.getVisible()))
                 .and(StringUtils.isNotBlank(menu.getStatus()), () -> tbSysMenu.status.eq(menu.getStatus()));
 

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysNoticeDataImpl.java

@@ -62,7 +62,7 @@ public class SysNoticeDataImpl implements ISysNoticeData, IJPACommData<SysNotice
 
     private Predicate buildQueryCondition(SysNotice query) {
         return PredicateBuilder.instance().and(StringUtils.isNotBlank(query.getNoticeTitle()), ()->
-                tbSysNotice.noticeTitle.like(query.getNoticeTitle()))
+                tbSysNotice.noticeTitle.like("%"+query.getNoticeTitle()+"%"))
                 .and(StringUtils.isNotBlank(query.getNoticeType()), ()->
                         tbSysNotice.noticeType.eq(query.getNoticeType()))
                 .and(StringUtils.isNotBlank(query.getStatus()), ()->
@@ -70,7 +70,7 @@ public class SysNoticeDataImpl implements ISysNoticeData, IJPACommData<SysNotice
                 .and(StringUtils.isNotBlank(query.getCreateByName()), ()->(
                         tbSysNotice.createBy.like(query.getCreateByName())))
                 .and(StringUtils.isNotBlank(query.getTenantId()), ()->(
-                        tbSysNotice.tenantId.like(query.getTenantId())))
+                        tbSysNotice.tenantId.eq(query.getTenantId())))
         .build();
     }
 }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysOperLogDataImpl.java

@@ -107,11 +107,11 @@ public class SysOperLogDataImpl implements ISysOperLogData, IJPACommData<SysOper
     private Predicate buildQueryCondition(SysOperLog data) {
         PredicateBuilder predicateBuilder = PredicateBuilder.instance()
 //                .and(StringUtils.isNotBlank(data.getTenantId()), () -> tbSysOperLog.tenantId.eq(data.getTenantId()))
-                .and(StringUtils.isNotBlank(data.getTitle()), () -> tbSysOperLog.title.like(data.getTitle()))
+                .and(StringUtils.isNotBlank(data.getTitle()), () -> tbSysOperLog.title.like("%"+data.getTitle()+"%"))
                 .and(data.getBusinessType() != null && data.getBusinessType() > 0, () -> tbSysOperLog.businessType.eq(data.getBusinessType()))
                 .and(ArrayUtil.isNotEmpty(data.getBusinessTypes()), () -> tbSysOperLog.businessType.in(Arrays.asList(data.getBusinessTypes())))
                 .and(data.getStatus() != null && data.getStatus() > 0, () -> tbSysOperLog.status.eq(data.getStatus()))
-                .and(StringUtils.isNotBlank(data.getOperName()), () -> tbSysOperLog.operName.like(data.getOperName()));
+                .and(StringUtils.isNotBlank(data.getOperName()), () -> tbSysOperLog.operName.like("%"+data.getOperName()+"%"));
         checkDataPermission(predicateBuilder,LoginHelper.getTenantId());
         return predicateBuilder.build();
     }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysOssDataImpl.java

@@ -1,10 +1,23 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
+import cc.iotkit.common.tenant.helper.TenantHelper;
+import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.data.dao.IJPACommData;
 import cc.iotkit.data.dao.SysOssRepository;
+import cc.iotkit.data.model.QTbSysOss;
 import cc.iotkit.data.model.TbSysOss;
 import cc.iotkit.data.system.ISysOssData;
+import cc.iotkit.data.util.PageBuilder;
+import cc.iotkit.data.util.PredicateBuilder;
 import cc.iotkit.model.system.SysOss;
+import cc.iotkit.model.system.SysUser;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +25,10 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
+import static cc.iotkit.data.model.QTbSysOss.tbSysOss;
+
 /**
  * @Author：tfd
  * @Date：2023/5/30 13:43
@@ -22,14 +39,14 @@ import org.springframework.stereotype.Service;
 public class SysOssDataImpl implements ISysOssData, IJPACommData<SysOss, Long> {
 
     @Autowired
-    private SysOssRepository baseRepository;
+    private SysOssRepository ossRepository;
 
     private final JPAQueryFactory jpaQueryFactory;
 
 
     @Override
     public JpaRepository getBaseRepository() {
-        return baseRepository;
+        return ossRepository;
     }
 
     @Override
@@ -43,4 +60,30 @@ public class SysOssDataImpl implements ISysOssData, IJPACommData<SysOss, Long> {
     }
 
 
+    @Override
+    public Paging<SysOss> findAll(PageRequest<SysOss> pageRequest) {
+        return PageBuilder.toPaging(ossRepository.findAll(buildQueryCondition(pageRequest.getData()), PageBuilder.toPageable(pageRequest))).to(SysOss.class);
+    }
+
+    private Predicate buildQueryCondition(SysOss data) {
+
+        PredicateBuilder predicateBuilder = PredicateBuilder.instance()
+                .and(ObjectUtil.isNotNull(data.getId()), () -> tbSysOss.id.eq(data.getId()))
+                .and(StringUtils.isNotEmpty(data.getTenantId()),()->tbSysOss.tenantId.eq(data.getTenantId()))
+                .and(StringUtils.isNotEmpty(data.getOriginalName()),()->tbSysOss.originalName.like("%"+ data.getOriginalName()+"%"))
+                .and(StringUtils.isNotEmpty(data.getFileName()), () -> tbSysOss.fileName.like("%" +data.getFileName()+"%"))
+                .and(StringUtils.isNotEmpty(data.getFileSuffix()), () -> tbSysOss.fileSuffix.endsWith(data.getFileSuffix()))
+                .and(StringUtils.isNotEmpty(data.getService()), () -> tbSysOss.service.like("%" +data.getService()+"%"));
+        checkDataPermission(predicateBuilder, TenantHelper.getTenantId());
+        return predicateBuilder.build();
+    }
+
+    private void checkDataPermission(PredicateBuilder predicateBuilder, String tenantId){
+        List<Long> finalDeptList = PredicateBuilder.queryCacheChildDeptIds(tenantId);
+        predicateBuilder.and(CollectionUtil.isNotEmpty(finalDeptList),()->tbSysOss.createDept.in(finalDeptList));
+
+    }
+
+
+
 }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleDataImpl.java

@@ -179,9 +179,9 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
         return PredicateBuilder.instance()
                 .and(tbSysRole.delFlag.eq(UserConstants.ROLE_NORMAL))
                 .and(Objects.nonNull(role.getId()), () -> tbSysRole.id.eq(role.getId()))
-                .and(StringUtils.isNotBlank(role.getRoleName()), () -> tbSysRole.roleName.like(role.getRoleName()))
+                .and(StringUtils.isNotBlank(role.getRoleName()), () -> tbSysRole.roleName.like("%"+role.getRoleName()+"%"))
                 .and(StringUtils.isNotBlank(role.getStatus()), () -> tbSysRole.roleName.eq(role.getStatus()))
-                .and(StringUtils.isNotBlank(role.getRoleKey()), () -> tbSysRole.roleKey.like(role.getRoleKey()))
+                .and(StringUtils.isNotBlank(role.getRoleKey()), () -> tbSysRole.roleKey.like("%"+role.getRoleKey()+"%"))
                 .and(StringUtils.isNotBlank(role.getTenantId()), () -> tbSysRole.tenantId.eq(role.getTenantId()))
                 .build();
 

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -219,8 +219,8 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         SysUser data = to.getData();
 
         PredicateBuilder builder = PredicateBuilder.instance()
-                .and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like(data.getPhonenumber()))
-                .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like(data.getUserName()))
+                .and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like("%"+data.getPhonenumber()+"%"))
+                .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like("%"+data.getUserName()+"%"))
                 .and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysUser.status.eq(data.getStatus()))
                 .and(Objects.nonNull(data.getDeptId()), () -> tbSysUser.deptId.eq(data.getDeptId()))
                 .and(tbSysUser.delFlag.eq(UserConstants.ROLE_NORMAL))
@@ -262,8 +262,8 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         SysUser data = to.getData();
         PredicateBuilder builder = PredicateBuilder.instance();
         if (Objects.nonNull(data)) {
-            builder.and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like(data.getPhonenumber()))
-                    .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like(data.getUserName()))
+            builder.and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like("%"+data.getPhonenumber()+"%"))
+                    .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like("%"+data.getUserName()+"%"))
                     .and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysUser.status.eq(data.getStatus()))
                     .and(Objects.nonNull(data.getDeptId()), () -> tbSysUser.deptId.eq(data.getDeptId()))
                     .and(tbSysUser.delFlag.eq(UserConstants.ROLE_NORMAL));

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java

@@ -23,7 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 文件上传 控制层
@@ -45,6 +47,10 @@ public class SysOssController extends BaseController {
     @ApiOperation(value = "查询OSS对象存储列表", notes = "查询OSS对象存储列表")
     @PostMapping("/list")
     public Paging<SysOssVo> list(@Validated(QueryGroup.class) @RequestBody PageRequest<SysOssBo> query) {
+        //按照时间倒叙
+        Map<String,String> sortMap = new HashMap<>();
+        sortMap.put("createTime","desc");
+        query.setSortMap(sortMap);
         return ossService.queryPageList(query);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java

@@ -80,6 +80,7 @@ public class SysUserController extends BaseController {
      * @param query
      */
     private static void checkAndModifyDeptId(PageRequest<SysUserBo> query) {
+
         if(ObjectUtil.isNull(query.getData().getDeptId())){
             query.getData().setDeptId(LoginHelper.getDeptId());
         }else{