diff --git a/WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx b/WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx new file mode 100644 index 00000000..020798c9 Binary files /dev/null and b/WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx differ diff --git a/WebRoot/Excel/d7764939-d8cc-4863-9da7-ae3f8c41e0fd.xlsx b/WebRoot/Excel/d7764939-d8cc-4863-9da7-ae3f8c41e0fd.xlsx new file mode 100644 index 00000000..110108ca Binary files /dev/null and b/WebRoot/Excel/d7764939-d8cc-4863-9da7-ae3f8c41e0fd.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 48f6b794..34640d1a 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -2026,12 +2026,23 @@ public class CollectModel { //写任务分派表 List list = new ArrayList<>(); int fill_type_id; - if (forPerson) { - fill_type_id = 1;//到人,肯定是填报 - } else { - //否则继承原来的fill_type_id - fill_type_id = getJobTarget(job_id, bureau_id).getInt("fill_type_id"); - } + + + /** + -- 市教育局让 县区教育局 只转不填 + 转发按钮里: + (1)县区教育局-》判断单位任务-》学校只填写 fill_type_id=1 + (2)县区教育局-》判断人员任务-》学校只转不填 fill_type_id=2 + (3)单位转给人员时->只填 fill_type_id=1 + */ + if (publish_role_id == 268) {//县区教育局办公室干事 + if (target_type_id == 1) {//单位 + fill_type_id = 1; + } else {//人员 + fill_type_id = 2; + } + } else fill_type_id = 1; + for (String s : targetSet) { Record record = new Record(); record.set("job_id", child_job_id); diff --git a/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java b/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java index 5835cb4c..1ce7ea74 100644 --- a/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java +++ b/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java @@ -21,7 +21,8 @@ public class LoginHandler extends Handler { private boolean isStaticFile(String uri) { uri = uri.toLowerCase(); // 判断文件类型是否为静态文件类型,根据需要进行调整 - return uri.endsWith(".css") || uri.endsWith(".js") || uri.endsWith(".png") || uri.endsWith(".jpg") || uri.endsWith(".html") || uri.endsWith(".config.yml"); + return uri.endsWith(".css") || uri.endsWith(".js") || uri.endsWith(".png") || uri.endsWith(".jpg") || + uri.endsWith(".html") || uri.endsWith(".config.yml")|| uri.endsWith(".svg"); } @Override