Merge branch 'dev' into test

PCS/src/main/java/cn/cslg/permission/common/JsonPage.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 封装分页查询结果的PageInfo类转换为该类，当前类应该和Page\PageInfo一样,既能包含分页查询结果,又包含分页信息
+ * 把封装着分页查询结果和分页信息的PageInfo类转换为本类并返回给前端(本类应和Page\PageInfo一样,既包含分页查询结果又包含分页信息)
  *
  * @Author chenyu
- * @Data 2023/2/16
+ * @Date 2023/2/16
  */
 @Data
 public class JsonPage implements Serializable {

PCS/src/main/java/cn/cslg/permission/controller/TenantVipTypeController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * 租户会员类型控制层
  *
  * @Author chenyu
- * @Data 2023/2/15
+ * @Date 2023/2/15
  */
 @Tag(name = "租户会员类型管理")
 @RequiredArgsConstructor

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

@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 租户会员类型管理的Service层接口
  *
  * @Author chenyu
- * @Data 2023/2/15
+ * @Date 2023/2/15
  */
 public interface ITenantVipTypeService {
     /**

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

@@ -153,9 +153,10 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
     public void deleteTenant(TenantVO tenantVO) {
         try {
             Tenant tenant = new Tenant();
-            tenant.setId(tenantVO.getId());
+            Integer tenantId = tenantVO.getId();
+            tenant.setId(tenantId);
             tenant.deleteById();
-            deleteService.deleteTenantAsso(tenantVO.getId());
+            deleteService.deleteTenantAsso(tenantId);
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
@@ -187,7 +188,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
             personnelVO1.setId(tenant.getPersonnelId());
             personnelService.updatePersonnel(personnelVO1);
             //修改关联
-            //修改租户和功能的关联信息
+            //租户和功能关联表修改信息
             List<AssoTenantVipTypeAndFunctionVO> assoTenantVipTypeAndFunctionVOS = assoTenantVipTypeFunctionMapper.selectByTenantVipTypeId(tenant.getTenantVipType());
             ArrayList<String> functions = new ArrayList<>();
             for (AssoTenantVipTypeAndFunctionVO assoTenantVipTypeAndFunctionVO : assoTenantVipTypeAndFunctionVOS) {

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * 租户会员类型管理的Service层接口实现类
  *
  * @Author chenyu
- * @Data 2023/2/15
+ * @Date 2023/2/15
  */
 @RequiredArgsConstructor
 @Slf4j
@@ -189,6 +189,7 @@ public class TenantVipTypeService implements ITenantVipTypeService {
             //我的方法：↓
             //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()
@@ -216,7 +217,7 @@ public class TenantVipTypeService implements ITenantVipTypeService {
      */
     @Override
     public void delete(Integer id) {
-        log.info("开始处理怕【删除租户会员类型】的业务，参数为：{}", id);
+        log.info("开始处理【删除租户会员类型】的业务，参数为：{}", id);
 
         //检查要删除的数据是否存在
         log.info("检查要删除的数据是否存在");