diff --git a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java index 57fe602e..5b994163 100644 --- a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java +++ b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java @@ -39,7 +39,7 @@ public class ResourceController extends Controller { //行政区划码 String area_code = rm.getAreaCode(identity_id, person_id); - Page list = rm.getZskPage(type_id,keyword,area_code, page, limit); + Page list = rm.getZskPage(person_id,type_id,keyword,area_code, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -74,7 +74,7 @@ public class ResourceController extends Controller { uploadFile.getFile().renameTo(targetFile); //保存到数据库记录 - rm.uploadZskDocument(fileName, key, type_id, identity_id, area_code); + rm.uploadZskDocument(fileName, key, type_id, identity_id, area_code,person_id); //返回 Kv kv = Kv.create(); diff --git a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java index f0fcb291..c94837ea 100644 --- a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java +++ b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java @@ -56,7 +56,7 @@ public class ResourceModel { * @param page * @param limit */ - public Page getZskPage(int type_id, String keyword, String area_code, int page, int limit) { + public Page getZskPage(String person_id, int type_id, String keyword, String area_code, int page, int limit) { List idList = new ArrayList<>(); //1、如果是云南省:查看所有自己发布的文档,不管是省,市,县,都能看到全省的文档 @@ -80,8 +80,15 @@ public class ResourceModel { if (!StrKit.isBlank(keyword)) { kv.set("keyword", keyword); } - SqlPara sqlPara = Db.getSqlPara("Resource.getZskPage",kv); - return Db.paginate(page, limit, sqlPara); + SqlPara sqlPara = Db.getSqlPara("Resource.getZskPage", kv); + Page records = Db.paginate(page, limit, sqlPara); + + for (Record record : records.getList()) { + String database_person_id = record.getStr("person_id"); + record.set("can_del", database_person_id.equals(person_id)); + } + + return records; } @@ -104,13 +111,14 @@ public class ResourceModel { * @param identity_id * @param area_code */ - public void uploadZskDocument(String name, String file_name, int type_id, int identity_id, String area_code) { + public void uploadZskDocument(String name, String file_name, int type_id, int identity_id, String area_code, String person_id) { Record record = new Record(); record.set("name", name); record.set("file_name", file_name); record.set("type_id", type_id); record.set("identity_id", identity_id); record.set("area_code", area_code); + record.set("person_id", person_id); Db.save("t_zsk_files", "id", record); } } diff --git a/src/main/java/com/dsideal/base/Tools/AddXzqh.java b/src/main/java/com/dsideal/base/Tools/AddXzqh.java index c9cb2714..ed16ab58 100644 --- a/src/main/java/com/dsideal/base/Tools/AddXzqh.java +++ b/src/main/java/com/dsideal/base/Tools/AddXzqh.java @@ -12,11 +12,10 @@ import com.jcraft.jsch.Session; public class AddXzqh { + public static DataEaseModel dm = new DataEaseModel(); + public static void main(String[] args) throws IOException, JSchException { Session session = SshConnectUtil.Init(); - - DataEaseModel dm = new DataEaseModel(); - //遍历所有以excel_开头的表,找出这些表中是不是存在行政区划,上级行政区划的列名 for (int identity_id : new int[]{1, 2, 3}) { List list = dm.getDataSetByIdentityId(identity_id);