Merge remote-tracking branch 'origin/master'

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);

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("公司管理员");

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<SysRole> sysRoles = baseMapper.selectBatchIds(Arrays.asList(role.getRoleId()));
-            // 筛选出roleKey=="client"或者"maintainer"的角色
+            // 筛选出roleKey=="companyAdmin"的角色
-            List<SysRole> collect = sysRoles.stream().filter(sysRole ->"companyAdmin".equals(sysRole.getRoleKey()) || "client".equals(sysRole.getRoleKey()) || "maintainer".equals(sysRole.getRoleKey())).collect(Collectors.toList());
+            List<SysRole> collect = sysRoles.stream().filter(sysRole ->"companyAdmin".equals(sysRole.getRoleKey()) ).collect(Collectors.toList());
             if (collect.size() > 0) {
                 throw new ServiceException("不能修改系统角色");
             }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -64,24 +64,23 @@ public class MybatisPlusConfig {
                             "sys_user",
                             "sys_role",
                             //业务表
-                            "as_maintainer",
+                            "pay_attendance",
-                            "as_client",
+                            "pay_baohuo_employee",
-                            "as_event",
+                            "pay_baohuo_product",
-                            "as_spare_part",
+                            "pay_baohuo_worktime",
-                            "as_spare_log",
+                            "pay_butie",
-                            "as_repair_log",
+                            "pay_butie_emplyee",
-                            // "as_repair_info",
+                            "pay_day_work_hours",
-                            "as_evaluation",
+                            "pay_dw_hours_contrast",
-                            "as_work_order",
+                            "pay_employee_info",
-                            "as_warehouse",
+                            "pay_material",
-                            "as_out_in_type",
+                            "pay_product_material",
-                            "as_product_type",
+                            "pay_products",
-                            "as_product_unit",
+                            "pay_require_attendance_report",
-                            "as_project",
+                            "pay_salary_report",
-                            "as_asset",
+                            "pay_work_order_baohuo",
-                            "as_asset_sxt",
+                            "pay_work_order_employee",
-                            "as_area",
+                            "pay_work_time"
-                            "as_asset_common"
                         };
                         // 转为 List
                         List<String> list = Arrays.asList(tenantTables);

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停用）