common/common-association/src/main/java/apelet/association/plugin/fileLibraryMange/FileLibrayListPlugin.java

@@ -1,9 +1,5 @@
 package apelet.association.plugin.fileLibraryMange;
 
-import apelet.common.core.object.ObjectValue;
-import apelet.common.core.object.TokenData;
-import apelet.common.core.util.ApplicationContextHolder;
-import apelet.common.generator.utils.OrmGenDataSourceUtil;
 import apelet.common.online.abstractplugin.ListPlugin;
 import apelet.common.online.dto.OnlineEventPluginExecuteDto;
 import apelet.common.online.dto.OnlineFilterDto;
@@ -13,51 +9,19 @@ import apelet.common.orm.impl.FilterItem;
 import java.util.ArrayList;
 
 public class FileLibrayListPlugin extends ListPlugin {
-
-
-//    @Override
-//    protected Filter getFilter() {
-//        OnlineEventPluginExecuteDto filter1 = this.getDto();
-//        ArrayList<OnlineFilterDto> filterDtoList = (ArrayList<OnlineFilterDto>) filter1.getListParams().get("filterDtoList");
-//        Filter filter = new Filter();
-//        if (!filterDtoList.isEmpty()) {
-//            OnlineFilterDto onlineFilterDto = filterDtoList.get(0);
-//            Object filterFile = onlineFilterDto.getColumnValue();
-//            filter.add(new FilterItem("classification", "=", filterFile));
-//
-//        } else {
-//            filter = new Filter();
-//        }
-//        return filter;
-//    }
-
     @Override
-    public String getSql(ObjectValue objectValue) {
+    protected Filter getFilter() {
         OnlineEventPluginExecuteDto filter1 = this.getDto();
         ArrayList<OnlineFilterDto> filterDtoList = (ArrayList<OnlineFilterDto>) filter1.getListParams().get("filterDtoList");
-
+        Filter filter = new Filter();
-//        return super.getSql(objectValue);
-        String sql = "select * from file_library ";
-        //阅读权限
-        sql += "where read_auth = 1";
         if (!filterDtoList.isEmpty()) {
             OnlineFilterDto onlineFilterDto = filterDtoList.get(0);
             Object filterFile = onlineFilterDto.getColumnValue();
-        sql += " and classification = "+filterFile.toString();
+            filter.add(new FilterItem("classification", "=", filterFile));
-        }
-        System.out.println(sql);
-        Long userId = TokenData.takeFromRequest().getUserId();
-        //获取当前用户
-        ObjectValue user = ormGenDataSourceUtil().queryOne("xy_sys_user", userId);
-        String userName = user.getString("show_name");
-        String userType = user.getString("user_type");
 
-        System.out.println("userName:" + userName+user.getString("user_type"));
+        } else {
-        if (userType.equals("0")) {
+            filter = new Filter();
-            sql += " or read_auth = 2";
         }
-        sql += " or (create_user_id = "+userId.toString()+" and read_auth = 3)";
+        return filter;
-
-        return sql;
     }
 }