From 5e54b2f179b171ce177b06f412350d4a682625d1 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 11:56:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=80=BC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update-sql/version4.0to4.1.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/update-sql/version4.0to4.1.sql b/update-sql/version4.0to4.1.sql index a9a48e72..8570eda7 100644 --- a/update-sql/version4.0to4.1.sql +++ b/update-sql/version4.0to4.1.sql @@ -10,6 +10,7 @@ ALTER TABLE li_goods DROP COLUMN freight_payer; /**添加商品类型**/ ALTER TABLE li_goods ADD goods_type VARCHAR ( 32 ); ALTER TABLE li_goods_sku ADD goods_type VARCHAR ( 32 ); +ALTER TABLE li_specification ADD spec_value text; UPDATE li_goods SET goods_type = "PHYSICAL_GOODS"; UPDATE li_goods_sku SET goods_type = "PHYSICAL_GOODS"; /**增加优惠券有效期类型**/ From 3ee3e49d0b46f8ef42662548f50c0506f5c11072 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 15:40:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=9B=B4=E6=92=AD=E6=97=B6=E6=B2=A1=E6=9C=89=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/broadcast/serviceimpl/StudioServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java index b48a6047..ce2823ce 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java @@ -200,7 +200,7 @@ public class StudioServiceImpl extends ServiceImpl impleme .eq(recommend != null, "recommend", true) .eq(status != null, "status", status) .orderByDesc("create_time"); - if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { + if (UserContext.getCurrentUser()!=null&&UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); } return this.page(PageUtil.initPage(pageVO), queryWrapper); From c1b9f287c7c8d764a0fd2e2089d31418a562daab Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 16:26:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=8D=B3=E8=B5=8B=E4=BA=88=E6=9D=83=E9=99=90=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82=E7=9B=B4=E6=92=AD=E9=97=B4=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/broadcast/serviceimpl/StudioServiceImpl.java | 2 +- .../permission/serviceimpl/AdminUserServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java index ce2823ce..bc677669 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java @@ -200,7 +200,7 @@ public class StudioServiceImpl extends ServiceImpl impleme .eq(recommend != null, "recommend", true) .eq(status != null, "status", status) .orderByDesc("create_time"); - if (UserContext.getCurrentUser()!=null&&UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { + if (UserContext.getCurrentUser() != null && UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); } return this.page(PageUtil.initPage(pageVO), queryWrapper); diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index d28b664e..831aec4b 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -199,13 +199,12 @@ public class AdminUserServiceImpl extends ServiceImpl 10) { throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN); } - if (roles != null && roles.size() > 0) { + if (roles.size() > 0) { dbUser.setRoleIds(StringUtils.join(",", roles)); } - - this.save(dbUser); - updateRole(adminUser.getId(), roles); + dbUser = this.findByUsername(dbUser.getUsername()); + updateRole(dbUser.getId(), roles); } From f509b8745d90b9f5b284d7eef388b09e31f43275 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 16:43:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?token=E7=94=9F=E6=88=90=E6=97=B6=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=BF=87=E6=BB=A4=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/common/token/base/generate/ManagerTokenGenerate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java index a58d1aa6..5b4d6e70 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java @@ -84,7 +84,7 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { //for循环路径集合 for (String path : paths) { //如果是超级权限 则计入超级权限 - if (menu.getIsSupper()) { + if (menu.getIsSupper() != null && menu.getIsSupper()) { //如果已有超级权限，则这里就不做权限的累加 if (!superPermissions.contains(path)) { superPermissions.add(path);