From d7b5beea461d6ae670634a186ce0c9df1709bb71 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 8 Sep 2023 14:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=EF=BC=9A=E4=B8=AA=E4=BA=BA=E7=AD=BE=E7=AB=A0?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AD=BE=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/Learun.Application.Web.csproj   | 7 +++++++
 .../Learun.Application.Web/XmlConfig/system.config         | 2 ++
 .../Learun.Application.WebApi.csproj                       | 1 +
 .../Learun.Application.WebApi/Modules/BaseApi.cs           | 2 +-
 .../Learun.Application.WebApi/XmlConfig/system.config      | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 85a6c1fe6..becfc810e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1650,6 +1650,10 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Index.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\StampDetailIndex.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.css" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Form.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.js" />
@@ -8289,6 +8293,9 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
index 190162288..ea0aaf173 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
@@ -168,6 +168,8 @@
 	<add key="QJUrl" value="www.qj.com"/>
 	<!--系主任角色Id-->
 	<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
+  <add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
 	<!-- 登录次数限制：登录连续错误要禁止登录 -->
 	<add key="ForbidLoginNum" value="5"/>
 	<!-- 禁止登录时间（分钟） -->
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
index c77251941..96b9f332c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
@@ -227,6 +227,7 @@
     <Compile Include="Modules\RepairReport\RepairReportTeacherApi.cs" />
     <Compile Include="Modules\RepairReport\RepairReportStudentApi.cs" />
     <Compile Include="Modules\SSOApi.cs" />
+    <Compile Include="Modules\StampPersonalApi.cs" />
     <Compile Include="Modules\StuEnrollOfficialApi.cs" />
     <Compile Include="Modules\AnnexesNoLoginApi.cs" />
     <Compile Include="Modules\AssetManagementSystem\Ass_AssetsInfoItemApi.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs
index db158f172..7652dd528 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs	
@@ -191,7 +191,7 @@ namespace Learun.Application.WebApi
             ReqParameter req = this.Bind<ReqParameter>();
             loginMark = req.loginMark;
             token = req.token;
-            if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize")
+            if (path == "/learun/adms/user/login" || path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/user/imgfordc" || path == "/learun/adms/timetable/timeTableData" || path == "/quanjiang/sso/authorize" || path == "/learun/adms/StampPersonal/img")
             {// 登录接口，默认页面接口不做权限验证处理
                 return null;
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config
index 75541c535..8594bbdf1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config	
@@ -111,6 +111,8 @@
   <add key="OnlineElectiveLessonApplyMax" value="2" />
   <!--系主任角色Id-->
   <add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
+  <add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
   <!--最早上课打卡时间（分钟）-->
   <add key="StuAttendanceEarliestMinute" value="15" />