5/8

PCS/src/main/java/cn/cslg/permission/service/TenantService.java

@@ -332,7 +332,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
                     .setEmail(tenantVo.getEmail())
                     .setState(tenantVo.getState())
                     .setPassword(tenantVo.getPassword())
-                    .setTenant(tenantVo.getId())
+                    .setTenant(tenantId)
                     .setAddType(1);
             Personnel personnel = personnelService.addPersonnel(personnelVO1);
             Role role = roles.get(0);

PCS/src/main/java/cn/cslg/permission/service/impl/TenantVipTypeService.java

@@ -210,11 +210,6 @@ public class TenantVipTypeService implements ITenantVipTypeService {
         List<AssoTenantVipTypeAndFunction> assoTenantVipTypeAndFunctions = new ArrayList<>();
         List<String> functionModifyPaths = tenantVipTypeFunctionUpdateDTO.getFunctionModifyPaths();
         for (String functionModifyPath : functionModifyPaths) {
-            //按逗号拆分路径，取拆分后的String[]中最后一个元素，将该元素转换为Integer类型
-            //我的方法：↓
-            //String functionStringId = functionModifyPath.substring(functionModifyPath.lastIndexOf(",") + 1);
-            //int functionId = Integer.parseInt(functionStringId);
-            //仁杰方法：↓
             String functionStringId = functionModifyPath.split(",")[functionModifyPath.split(",").length - 1];
             int functionId = Integer.parseInt(functionStringId);
             AssoTenantVipTypeAndFunction assoTenantVipTypeAndFunction = new AssoTenantVipTypeAndFunction()
@@ -222,19 +217,6 @@ public class TenantVipTypeService implements ITenantVipTypeService {
                     .setFunctionId(functionId)
                     .setFunctionModifyPath(functionModifyPath);
             assoTenantVipTypeAndFunctions.add(assoTenantVipTypeAndFunction);
-//            //根据当前功能id查询其下未展示的子级功能
-//            List<FunctionVO2> functionVO2s = functionMapper.selectNotShowChildrenById(functionId);
-//            for (FunctionVO2 functionVO2 : functionVO2s) {
-//                String path = functionVO2.getPath();
-//                Integer notShowChidlrenFunctionId = functionVO2.getId();
-//                Integer applicationId = functionVO2.getApplicationId();
-//                String notShowChildrenFunctionModifyPath = applicationId + "," + path.substring(path.indexOf(",") + 1) + "," + notShowChidlrenFunctionId;
-//                AssoTenantVipTypeAndFunction assoTenantVipTypeAndFunction2 = new AssoTenantVipTypeAndFunction()
-//                        .setTenantVipTypeId(tenantVipTypeId)
-//                        .setFunctionId(notShowChidlrenFunctionId)
-//                        .setFunctionModifyPath(notShowChildrenFunctionModifyPath);
-//                assoTenantVipTypeAndFunctions.add(assoTenantVipTypeAndFunction2);
-//            }
         }
         log.info("新数据入租户会员类型和功能关联表");
         rows = assoTenantVipTypeFunctionMapper.insertBatch(assoTenantVipTypeAndFunctions);