From 3f2425aa285e0365aca876b0171b51b589783823 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 15 May 2025 16:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E3=80=81=E8=AE=A2=E9=98=85=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 5 +-- .../system/SysRegisterController.java | 2 +- .../controller/system/SysRoleController.java | 4 +-- .../framework/config/MybatisPlusConfig.java | 35 +++++++++---------- .../java/com/ruoyi/pay/domain/PaySubInfo.java | 2 ++ 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index bc28b1e..c459cef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -81,9 +81,10 @@ public class SysLoginController { loginBody.getUuid()); //除管理员用户外,所有用户根据用户公司拿到到期时间 未到期允许登录 否则不允许登录 - String companyName = LoginHelper.getCompanyName(); + // String companyName = LoginHelper.getCompanyName(); Long tenantId = LoginHelper.getTenantId(); - if(companyName!=null&&companyName!=""){ + // if(companyName!=null&&companyName!=""){ + if(tenantId!=null){ //查询订阅信息中的结束时间 PaySubInfoBo bo = new PaySubInfoBo(); bo.setTenantId(tenantId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 6a21a40..a18c372 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -87,7 +87,7 @@ public class SysRegisterController extends BaseController { } if(iPayTenantService.insertByBo(bo)){ //公司注册成功后自动添加角色：管理员 todo - Long[] adids={}; + Long[] adids={1L, 1921833283434213378L, 1921827581902888962L, 1921827581902888963L, 1921827581902888964L, 1921827581902888965L, 1921827581902888966L, 1921827581902888967L, 1921833488053334018L, 1921827579365335041L, 1921827579365335042L, 1921827579365335043L, 1921827579365335044L, 1921827579365335045L, 1921827579365335046L, 1921827582745944066L, 1921827582745944067L, 1921827582745944068L, 1921827582745944069L, 1921827582745944070L, 1921827582745944071L, 1921827581055639553L, 1921827581055639554L, 1921827581055639555L, 1921827581055639556L, 1921827581055639557L, 1921827581055639558L, 1921827581252771841L, 1921827581252771842L, 1921827581252771843L, 1921827581252771844L, 1921827581252771845L, 1921827581252771846L, 1921834138757656577L, 1921827582162935809L, 1921827582162935810L, 1921827582162935811L, 1921827582162935812L, 1921827582162935813L, 1921827582162935814L, 1921827582490091522L, 1921827582490091523L, 1921827582490091524L, 1921827582490091525L, 1921827582490091526L, 1921827582490091527L, 1921827583140208641L, 1921827583140208642L, 1921827583140208643L, 1921827583140208644L, 1921827583140208645L, 1921827583140208646L, 1921827581449904130L, 1921827581449904131L, 1921827581449904132L, 1921827581449904133L, 1921827581449904134L, 1921827581449904135L, 1921827583601582082L, 1921827583601582083L, 1921827583601582084L, 1921827583601582085L, 1921827583601582086L, 1921827583601582087L, 1921835117498494977L, 1921827582880161794L, 1921827582880161795L, 1921827582880161796L, 1921827582880161797L, 1921827582880161798L, 1921827582880161799L, 100L, 1001L, 1002L, 1003L, 1004L, 1005L, 1006L, 1007L, 101L, 1010L, 1011L, 1012L, 1013L, 1014L}; SysRole role1 = new SysRole(); role1.setRoleKey("companyAdmin"); role1.setRoleName("公司管理员"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index cecfcc0..f8050e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -109,8 +109,8 @@ public class SysRoleController extends BaseController { if(!LoginHelper.isAdmin()){ // 获取角色列表 List sysRoles = baseMapper.selectBatchIds(Arrays.asList(role.getRoleId())); - // 筛选出roleKey=="client"或者"maintainer"的角色 - List collect = sysRoles.stream().filter(sysRole ->"companyAdmin".equals(sysRole.getRoleKey()) || "client".equals(sysRole.getRoleKey()) || "maintainer".equals(sysRole.getRoleKey())).collect(Collectors.toList()); + // 筛选出roleKey=="companyAdmin"的角色 + List collect = sysRoles.stream().filter(sysRole ->"companyAdmin".equals(sysRole.getRoleKey()) ).collect(Collectors.toList()); if (collect.size() > 0) { throw new ServiceException("不能修改系统角色"); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index c22cdc6..88e45a2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -64,24 +64,23 @@ public class MybatisPlusConfig { "sys_user", "sys_role", //业务表 - "as_maintainer", - "as_client", - "as_event", - "as_spare_part", - "as_spare_log", - "as_repair_log", - // "as_repair_info", - "as_evaluation", - "as_work_order", - "as_warehouse", - "as_out_in_type", - "as_product_type", - "as_product_unit", - "as_project", - "as_asset", - "as_asset_sxt", - "as_area", - "as_asset_common" + "pay_attendance", + "pay_baohuo_employee", + "pay_baohuo_product", + "pay_baohuo_worktime", + "pay_butie", + "pay_butie_emplyee", + "pay_day_work_hours", + "pay_dw_hours_contrast", + "pay_employee_info", + "pay_material", + "pay_product_material", + "pay_products", + "pay_require_attendance_report", + "pay_salary_report", + "pay_work_order_baohuo", + "pay_work_order_employee", + "pay_work_time" }; // 转为 List List list = Arrays.asList(tenantTables); diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PaySubInfo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PaySubInfo.java index d1e5990..817b570 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PaySubInfo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PaySubInfo.java @@ -40,10 +40,12 @@ public class PaySubInfo extends BaseEntity { /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date startTime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date endTime; /** * 激活情况（0已激活 1停用）