From d2c49c22e93ef5e3f3cfe2ebdbd3122f500f5bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AD=E3=80=8E=E2=80=AD=E3=80=8F?= Date: Tue, 12 Sep 2023 02:24:35 +0000 Subject: [PATCH 1/2] fix #https://gitee.com/dromara/MaxKey/issues/I80G84 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ‭『‭』 --- .../maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml index 9ac70644a..638a09be1 100644 --- a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml @@ -118,7 +118,7 @@ mxk_userinfo u where u.id not in( - select rm.memberid + select gm.memberid from mxk_groups g,mxk_group_member gm where 1 = 1 From 81366ec259e5099459b445f230bea02cd12a98e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=99=93=E4=BC=9F?= Date: Wed, 13 Sep 2023 15:17:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:wrench:=20=E5=A2=9E=E5=8A=A0=20scripts?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=A4=84=E7=90=86=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=B8=8E=E9=95=9C=E5=83=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://gitee.com/dromara/MaxKey/issues/I81133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maxkey-web-frontend/maxkey-web-app/package.json | 1 + maxkey-web-frontend/maxkey-web-mgt-app/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/maxkey-web-frontend/maxkey-web-app/package.json b/maxkey-web-frontend/maxkey-web-app/package.json index 9a52cf7ac..43df846bc 100644 --- a/maxkey-web-frontend/maxkey-web-app/package.json +++ b/maxkey-web-frontend/maxkey-web-app/package.json @@ -21,6 +21,7 @@ "scaffold" ], "scripts": { + "npm:pre": "npm install --ignore-scripts --registry https://registry.npmmirror.com || npm install --ignore-scripts --registry https://registry.npmjs.org", "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng", "ng": "ng", "start": "ng s -o --serve-path=/maxkey/ --port=8527", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/package.json b/maxkey-web-frontend/maxkey-web-mgt-app/package.json index 2be52e2d8..3b11a29a6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/package.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/package.json @@ -21,6 +21,7 @@ "scaffold" ], "scripts": { + "npm:pre": "npm install --ignore-scripts --registry https://registry.npmmirror.com || npm install --ignore-scripts --registry https://registry.npmjs.org", "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng", "ng": "ng", "start": "ng s -o --serve-path=/maxkey-mgt/ --port=8526",