From 30c36ac01dc0c87ede5e62c3d71aba46ab2740ab Mon Sep 17 00:00:00 2001 From: chengminglong <123204464@qq.com> Date: Thu, 12 Jan 2023 16:17:42 +0800 Subject: [PATCH] =?UTF-8?q?2023-01-12=20=E3=80=90=E7=94=A8=E7=AB=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E8=B0=83=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oa/service/ChapterService.java | 7 +- .../modules/oa/chapter/addChapterApply.jsp | 126 ++++++++++++++---- .../views/modules/oa/chapter/chapterCheck.jsp | 16 +-- .../views/modules/oa/chapter/showChapter.jsp | 15 --- .../modules/oa/chapter/showChapterApply.jsp | 16 +-- .../static/assets/js/customjs/form-custom.js | 25 ---- 6 files changed, 105 insertions(+), 100 deletions(-) diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java index 7390a009..21528a5d 100644 --- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java +++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java @@ -895,10 +895,9 @@ public class ChapterService extends BaseService { } else { // fengchangming: // 9da4420d-508d-421a-9d5a-fe5ab90a0079 长春市宽城区教育局 - // 702e2007-cd47-4c2b-a05c-a9e0574361cc 法人章 if (user.getId().equals(yzdjxzbgsdjrId)) { - String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID in " + - "('9da4420d-508d-421a-9d5a-fe5ab90a0079','702e2007-cd47-4c2b-a05c-a9e0574361cc') and DELETE_FLAG = 0) "; + String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID = '9da4420d-508d-421a-9d5a-fe5ab90a0079' " + + "and DELETE_FLAG = 0) "; dc.add(Restrictions.sqlRestriction(sql)); } // wumingtao: @@ -1518,7 +1517,7 @@ public class ChapterService extends BaseService { scheduleFlowList.add(chapterFlow); } - if (jyjcwsjkId.equals(chapter.getOrgDeptId()) || (chapter.getApplyCapitalFlag() != null && chapter.getApplyCapitalFlag() == 1)){ + if (jyjcwsjkId.equals(chapter.getOrgDeptId()) || ((chapter.getApplyCapitalFlag() != null && chapter.getApplyCapitalFlag() == 1) || (chapter.getAssetTransferFlag() != null && chapter.getAssetTransferFlag() == 1))){ //财务初审 if (StringUtils.isNotBlank(chapter.getFinanceCheckUserFirst())) { ChapterFlow chapterFlow = new ChapterFlow(chapter.getFinanceCheckUserFirst()); diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp index 31c72a65..e5e78b22 100644 --- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp +++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp @@ -9,7 +9,7 @@ function chapterChangeCallBack() { var chapterIdsValue = $("#chapterIds").val(); //包含党组用章 - if (chapterIdsValue == "4d9c7942-cf29-4621-a652-d17bb707d311") { + if (chapterIdsValue.indexOf("4d9c7942-cf29-4621-a652-d17bb707d311") > -1) { $("#orgDeptIdId").val("33220B14-6DFA-4946-B1CA-AEE956BA478E"); $("#orgDeptIdName").val("党政干部办公室"); $("#orgDeptIdName").attr("disabled","disabled"); @@ -50,10 +50,13 @@ - + + + + - + @@ -82,7 +85,7 @@
@@ -104,7 +107,7 @@ @@ -126,7 +129,7 @@ @@ -191,26 +194,6 @@ - -