From 9e29d9a6c230431fe996dc7ba375b39db1b96639 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 12 Jul 2022 14:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E5=88=86=E7=B1=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/util/CoeProcessLevelUtil.java | 3 +- .../template/page/main.htm | 2 +- .../{app.b58aa8df.css => app.634e376c.css} | 2 +- ...cc4095.css => chunk-18ba0bf3.b9b5de63.css} | 0 ...5e2b5a.css => chunk-1fd5b92a.9170273e.css} | 0 ...a87600.css => chunk-201283e8.3761301d.css} | 0 ...3dbaa2.css => chunk-3a7599c6.bb861d84.css} | 0 .../main/css/chunk-532765fe.0cca68dd.css | 1 + ...a46a36.css => chunk-6a168504.2ccf5270.css} | 2 +- ...2f3f84.css => chunk-6c83edf4.6c467910.css} | 0 ...fd01d3.css => chunk-9d1e04c4.d1caea12.css} | 0 .../main/css/chunk-bb3b9f20.f7f4b256.css | 1 - ...3e7967.css => chunk-f3e4ff48.721c4dc9.css} | 0 ...ont.71026185.svg => iconfont.1c1408b5.svg} | 0 ...1d3.svg => iconfont.ce1b01d3.7c0515fd.svg} | 0 .../js/{app.b8ec9774.js => app.f342b1ba.js} | 4 +- .../main/js/chunk-18ba0bf3.d0d27872.js | 1 + .../main/js/chunk-1ead3fe3.a017cf12.js | 1 - ...ad686911.js => chunk-1fd5b92a.07c16352.js} | 2 +- .../main/js/chunk-201283e8.208e8fb5.js | 1 + .../main/js/chunk-21453108.ee636e90.js | 1 - .../main/js/chunk-23a660f0.a0811617.js | 1 - ...128f137a.js => chunk-2d0ab156.ca03ae9d.js} | 2 +- ...1061dc70.js => chunk-2d0b25b0.3ebfc816.js} | 2 +- ...b230933d.js => chunk-2d0f078a.3038704d.js} | 2 +- ...7474d207.js => chunk-2d216d3a.96ada280.js} | 2 +- ...5d50ea7e.js => chunk-2d224b23.e62adedc.js} | 2 +- ...3618651e.js => chunk-2d224ef1.44cb7f2b.js} | 2 +- .../main/js/chunk-3178e2bf.e4bd60ae.js | 1 - ...5d5601d8.js => chunk-3a7599c6.5d555915.js} | 2 +- .../main/js/chunk-3a9b7577.1c8372d8.js | 1 - .../main/js/chunk-532765fe.9bb04323.js | 1 + .../main/js/chunk-5ca06e36.c64d879b.js | 1 + .../main/js/chunk-6a168504.97568202.js | 1 + .../main/js/chunk-6c83edf4.93b8726a.js | 1 + .../main/js/chunk-79148172.6e616cff.js | 1 - .../main/js/chunk-9d1e04c4.ddede9a0.js | 1 + .../main/js/chunk-b158b92a.011e3ae6.js | 1 - .../main/js/chunk-bb3b9f20.90babfc9.js | 1 - .../main/js/chunk-bf7921b8.1d6eee48.js | 1 + .../main/js/chunk-ccd54d8e.24069105.js | 1 - .../main/js/chunk-f3e4ff48.6d7f9787.js | 1 + .../main/js/chunk-vendors.54a27270.js | 38 ------------------- .../main/js/chunk-vendors.bd2b52b4.js | 38 +++++++++++++++++++ 44 files changed, 62 insertions(+), 63 deletions(-) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{app.b58aa8df.css => app.634e376c.css} (99%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-23a660f0.0ecc4095.css => chunk-18ba0bf3.b9b5de63.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-03c6285a.7d5e2b5a.css => chunk-1fd5b92a.9170273e.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-ccd54d8e.44a87600.css => chunk-201283e8.3761301d.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-0df035f6.e83dbaa2.css => chunk-3a7599c6.bb861d84.css} (100%) create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-1ead3fe3.32a46a36.css => chunk-6a168504.2ccf5270.css} (68%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-b158b92a.fe2f3f84.css => chunk-6c83edf4.6c467910.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-21453108.a3fd01d3.css => chunk-9d1e04c4.d1caea12.css} (100%) delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-79148172.dc3e7967.css => chunk-f3e4ff48.721c4dc9.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.71026185.svg => iconfont.1c1408b5.svg} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.ce1b01d3.ce1b01d3.svg => iconfont.ce1b01d3.7c0515fd.svg} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{app.b8ec9774.js => app.f342b1ba.js} (99%) create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-1ead3fe3.a017cf12.js rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-03c6285a.ad686911.js => chunk-1fd5b92a.07c16352.js} (97%) create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-201283e8.208e8fb5.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.ee636e90.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.a0811617.js rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0ab156.128f137a.js => chunk-2d0ab156.ca03ae9d.js} (82%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d212b99.1061dc70.js => chunk-2d0b25b0.3ebfc816.js} (99%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0f078a.b230933d.js => chunk-2d0f078a.3038704d.js} (90%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d216d3a.7474d207.js => chunk-2d216d3a.96ada280.js} (91%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224b23.5d50ea7e.js => chunk-2d224b23.e62adedc.js} (84%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224ef1.3618651e.js => chunk-2d224ef1.44cb7f2b.js} (90%) delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.e4bd60ae.js rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-0df035f6.5d5601d8.js => chunk-3a7599c6.5d555915.js} (98%) delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-6a168504.97568202.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.6e616cff.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.011e3ae6.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.90babfc9.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-ccd54d8e.24069105.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.54a27270.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java index 77f144cc..e56ea0f4 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java @@ -2377,8 +2377,7 @@ public class CoeProcessLevelUtil { result.add(model.getVersionId()); } } else if (UtilString.isNotEmpty(category)){// 再判断建模分类(大)是否符合 - // 由之前model.getMethodCategory() 改为model.getParentId()进行判断 by zhaolei - if (model.getParentId().equals(category)) { + if (model.getMethodCategory().equals(category)) { result.add(model.getVersionId()); } } else { diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm index c66b24ce..5c909214 100644 --- a/com.actionsoft.apps.coe.pal/template/page/main.htm +++ b/com.actionsoft.apps.coe.pal/template/page/main.htm @@ -13,4 +13,4 @@ var mainType = "<#mainType>"; var uid = "<#uid>"; var wHref = "./w"; - var jdHref = "./jd";