Miracle 部署微服务应用

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx

@@ -741,7 +741,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
         }
         const parameters: any[] = [
             { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
-            { pathName: 'editview', parameterName: 'editview' },
+            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {

app_PIM/src/store/modules/view-action/state.ts

@@ -163,7 +163,6 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'c8310acd7e65d023051725aac59122d9',
-                '0dbdd98c4946bd6e79feb18e32dd387b',
             ],
         },
         {

humanresource-core/src/main/resources/mapper/humanresource/hrarchives/HRArchivesMapper.xml

@@ -50,6 +50,12 @@
 		<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID = t31.ORGANIZATIONID  
 			]]>
     </sql>
+    <!--数据查询[NonEmployee]-->
+    <sql id="NonEmployee" databaseId="mysql">
+		<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID = t31.ORGANIZATIONID  
+					 WHERE 	( ( t11.`EMPSTATE` = '50'  OR  t11.`EMPSTATE` = '60' )  AND  t1.`ACTIVEFLAG` = 1 )
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID = t31.ORGANIZATIONID