Merge remote-tracking branch 'origin/dev2' into dev2

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiGetDepartmentDTO.java

@@ -0,0 +1,8 @@
+package cn.cslg.permission.common.model.qiaobi;
+
+import lombok.Data;
+
+@Data
+public class QiaoBiGetDepartmentDTO {
+    private String enterpriseCode;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiVipTypeDTO.java

@@ -10,4 +10,6 @@ import lombok.experimental.Accessors;
 public class QiaoBiVipTypeDTO {
 private String vipTypeName;
 private String appCode;
+private Integer tenantId;
+private String enterpriseCode;
 }

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/UpdateTenantVipDTO.java

@@ -0,0 +1,12 @@
+package cn.cslg.permission.common.model.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UpdateTenantVipDTO {
+    private Integer tenantId;
+    private List<VipTypeNumDTO> vipTypes;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/AuditTaskDTO.java

@@ -0,0 +1,11 @@
+package cn.cslg.permission.common.model.qiaobi.businessTask;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AuditTaskDTO {
+    private List<Integer> taskIds;
+    private Integer result;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/QueryAuditTaskDTO.java

@@ -0,0 +1,11 @@
+package cn.cslg.permission.common.model.qiaobi.businessTask;
+
+import lombok.Data;
+
+@Data
+public class QueryAuditTaskDTO {
+   private Integer status;
+   private  Integer type;
+   private Integer auditResult;
+   private Integer tenantId;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/QueryAuditTaskVO.java

@@ -0,0 +1,27 @@
+package cn.cslg.permission.common.model.qiaobi.businessTask;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class QueryAuditTaskVO {
+   private Integer departMentId;
+   private String  departMentName;
+   private Integer positionId;
+   private String  positionName;
+   private String personnelName;
+   private String personnelPhone;
+   private String personnelEmail;
+   private String personnelUserName;
+   private String  personnelPassword;
+   private Integer status;
+   private String auditResult;
+   private Integer handleId;
+   private String handleName;
+   private Date createTime;
+   private Integer createId;
+   private String createName;
+   private Integer type;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/CompanyPersonSignUpDTO.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.common.model.qiaobi.tenant;
+
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.Data;
+
+@Data
+public class CompanyPersonSignUpDTO {
+   private String enterpriseCode;
+   private Integer departMentId;
+   private Integer positionId;
+   private String personnelName;
+   private String  personnelPhone;
+   private String personnelEmail;
+   private String personnelUserName;
+    private String  personnelPassword;
+    private String phoneCode;
+    private String  vipTypeId;
+}

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/QiaoBiTenantVO.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.common.model.qiaobi.tenant;
+
+import lombok.Data;
+
+@Data
+public class QiaoBiTenantVO {
+    private String address;
+    private String name;
+    private String describe;
+    private Integer id;
+    private Integer number;
+    private Integer state;
+    private Integer type;
+    private String userName;
+    private String email;
+
+
+}

PCS/src/main/java/cn/cslg/permission/common/utils/BackupUtils.java

@@ -34,9 +34,6 @@ public class BackupUtils {
         }
     }
 
-    public static void main(String[] args) {
-        System.out.println(getBackupConfig());
-    }
 
     public void run() {
         Backup backup = getBackupConfig();

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

@@ -1,6 +1,7 @@
 package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiGetDepartmentDTO;
 import cn.cslg.permission.common.model.vo.DepartmentVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
@@ -69,4 +70,11 @@ public class DepartmentController {
     public String queryDepartmentInfo(Integer id) {
         return departmentService.queryDepartmentById(id);
     }
+
+    @PostMapping("/getDepartmentListByCode")
+    @Operation(summary = "查询部门列表")
+    public String getDepartmentListByCode(@RequestBody QiaoBiGetDepartmentDTO qiaoBiGetDepartmentDTO) {
+        return departmentService.getDepartmentListByCode(qiaoBiGetDepartmentDTO);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiGetDepartmentDTO;
 import cn.cslg.permission.common.model.vo.PositionVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
@@ -59,4 +60,11 @@ public class PositionController {
     public String queryPositionInfo(Integer id) {
         return positionService.queryPositionById(id);
     }
+
+    @PostMapping("/getPositionListByCode")
+    @Operation(summary = "查询所有职位")
+    public String getPositionListByCode(@RequestBody QiaoBiGetDepartmentDTO qiaoBiGetDepartmentDTO) {
+        return positionService.getPositionListByCode(qiaoBiGetDepartmentDTO);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.qiaobi.UpdateTenantVipDTO;
 import cn.cslg.permission.common.model.vo.TenantVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
@@ -39,7 +40,7 @@ public class TenantController {
         }
     }
 
-    @PostMapping("/addByInvitation")
+
     @Operation(summary = "根据邀请码添加租户")
     public String addByInvitation(@RequestBody TenantVO tenantVo) {
         try {
@@ -116,4 +117,10 @@ public class TenantController {
         return Response.success(tenantService.getAdminEmailPersons());
     }
 
+    @Operation(summary = "更新租户vip")
+    @PostMapping("/updateTenantVip")
+    public String updateTenantVip(@RequestBody UpdateTenantVipDTO updateTenantVipDTO) {
+        
+        return Response.success(tenantService.getAdminEmailPersons());
+    }
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/BusinessTaskController.java

@@ -0,0 +1,48 @@
+package cn.cslg.permission.controller.qiaobi;
+
+import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.Records;
+import cn.cslg.permission.common.model.dto.SendCodeDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.AuditTaskDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskVO;
+import cn.cslg.permission.common.model.qiaobi.paidCode.*;
+import cn.cslg.permission.common.utils.Response;
+import cn.cslg.permission.service.VersionService;
+import cn.cslg.permission.service.qiaobi.BusinessTaskService;
+import cn.cslg.permission.service.qiaobi.PaidCodeService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author lrj
+ * @Date 2024/12/09
+ */
+@Slf4j
+@RestController
+@RequestMapping(Constants.PERMISSION_API + "/businessTask")
+public class BusinessTaskController {
+    @Autowired
+    private BusinessTaskService businessTaskService;
+
+    @Operation(summary = "查询审核任务")
+    @PostMapping("/queryAuditTask")
+    public String queryAuditTask(@RequestBody QueryAuditTaskDTO queryAuditTaskDTO) {
+        List<QueryAuditTaskVO> queryAuditTaskDTOList = businessTaskService.queryAuditTask(queryAuditTaskDTO);
+        return Response.success(queryAuditTaskDTOList);
+    }
+
+    @Operation(summary = "审核任务")
+    @PostMapping("/auditTask")
+    public String auditTask(@RequestBody AuditTaskDTO auditTaskDTO) {
+        businessTaskService.auditTasks(auditTaskDTO);
+        return Response.success(true);
+    }
+}

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/PaidCodeController.java

@@ -5,9 +5,7 @@ import cn.cslg.permission.common.model.Records;
 import cn.cslg.permission.common.model.dto.QueryVersionListDTO;
 import cn.cslg.permission.common.model.dto.SendCodeDTO;
 import cn.cslg.permission.common.model.dto.VersionDTO;
-import cn.cslg.permission.common.model.qiaobi.paidCode.PaidCodeAddDTO;
-import cn.cslg.permission.common.model.qiaobi.paidCode.PaidCodeQueryDTO;
-import cn.cslg.permission.common.model.qiaobi.paidCode.PaidCodeStatusDTO;
+import cn.cslg.permission.common.model.qiaobi.paidCode.*;
 import cn.cslg.permission.common.model.qiaobi.version.AddFunctionDTO;
 import cn.cslg.permission.common.model.qiaobi.version.QiaoBiVersionVO;
 import cn.cslg.permission.common.model.qiaobi.version.QueryFunctionCodeTreeVO;
@@ -77,8 +75,8 @@ public class PaidCodeController {
 
     @Operation(summary = "验证付费码")
     @PostMapping("/checkPhoneCode")
-    public String checkPhoneCode(@RequestBody SendCodeDTO sendCodeDTO) {
-        String result = paidCodeService.sendPhoneCode(sendCodeDTO);
-        return Response.success(result);
+    public String checkPhoneCode(@RequestBody CheckPaidCodePhoneCodeDTO checkPaidCodePhoneCodeDTO) {
+        PaidCodeReInfoVO paidCodeReInfoVO = paidCodeService.checkPhoneCode(checkPaidCodePhoneCodeDTO);
+        return Response.success(paidCodeReInfoVO);
     }
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/QiaoBiPersonController.java

@@ -6,6 +6,7 @@ import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.CompanyPersonSignUpDTO;
 import cn.cslg.permission.common.model.vo.LoginVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
@@ -64,8 +65,8 @@ public class QiaoBiPersonController {
 
     @PostMapping("/companyPersonSignUp")
     @Operation(summary = "企业用户注册")
-    public String companyPersonSignUp(@RequestBody QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
-        qiaoBiPersonService.personSignUp(qiaoBiPersonSignUpDTO);
-        return Response.success();
+    public String companyPersonSignUp(@RequestBody CompanyPersonSignUpDTO companyPersonSignUpDTO) {
+        qiaoBiPersonService.companyPersonSignUp(companyPersonSignUpDTO);
+        return Response.success(true);
     }
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/VipTypeController.java

@@ -91,4 +91,12 @@ public class VipTypeController {
         List<FunctionCodeTreeVO> vos = functionService.queryVipFunctionTree(queryVipFunctionDTO);
         return Response.success(vos);
     }
+
+    @PostMapping("/queryTenantVipTypeByCode")
+    @Operation(summary = "根据租户码查询租户版本")
+    public String queryTenantVipTypeByCode(@RequestBody QiaoBiVipTypeDTO qiaoBiVipTypeDTO) {
+        List<QiaoBiVIPTypeVO> vos = appVipTypeService.qiaoBiTenantVIPTypeVOList(qiaoBiVipTypeDTO);
+        return Response.success(vos);
+    }
+
 }

PCS/src/main/java/cn/cslg/permission/domain/Role.java

@@ -42,4 +42,9 @@ public class Role extends BaseEntity<Role> {
     @TableField(value = "TENANT_ID")
     private Integer tenantId;
 
+    /**
+     * 角色描述
+     */
+    @TableField(value = "APPLICATION_CODE")
+    private Integer applicationCode;
 }

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/AssoTenantVipType.java

@@ -0,0 +1,22 @@
+package cn.cslg.permission.domain.qiaobi;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * @TableName ASSO_TENANT_VIP_TYPE
+ */
+@TableName(value ="ASSO_TENANT_VIP_TYPE")
+@Data
+public class AssoTenantVipType extends Model<AssoTenantVipType> {
+    private Integer id;
+
+    private Integer tenantId;
+
+    private Integer vipTypeId;
+
+    private Integer vipTypeNum;
+}

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/BusinessTask.java

@@ -0,0 +1,35 @@
+package cn.cslg.permission.domain.qiaobi;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * @TableName BUSINESS_TASK
+ */
+@TableName(value ="BUSINESS_TASK")
+@Data
+public class BusinessTask extends Model<BusinessTask> {
+    private Integer id;
+
+    private Integer taskType;
+
+    private Date createTime;
+
+
+    private Integer handleId;
+
+    private Integer result;
+
+    private Integer createId;
+
+    private Integer status;
+    private Integer tenantId;
+
+}

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/EnterpriseCode.java

@@ -0,0 +1,24 @@
+package cn.cslg.permission.domain.qiaobi;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * @TableName ENTERPRISE_CODE
+ */
+@TableName(value ="ENTERPRISE_CODE")
+@Data
+public class EnterpriseCode extends Model<EnterpriseCode> {
+    private Integer id;
+
+    private Integer tenantId;
+
+    private String code;
+
+}

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/RegistInformation.java

@@ -32,6 +32,10 @@ public class RegistInformation extends Model {
     private String personnelUsername;
 
     private String personnelPassword;
-
-    private static final long serialVersionUID = 1L;
+    @TableField(value = "DEPARTMENT_ID")
+    private Integer departMentId;
+    @TableField(value = "POSITION_ID")
+    private Integer positionId;
+    @TableField(value = "VIP_TYPE_ID")
+    private Integer vipTypeId;
 }

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AppVipTypeMapper.java

@@ -21,6 +21,8 @@ public interface AppVipTypeMapper extends BaseMapper<AppVipType> {
     List<AppVipTypeVO> queryAppVipType(QueryVipDTO queryVipDTO);
     Long queryAppVipTypeTotal(QueryVipDTO queryVipDTO);
 
+    public List<QiaoBiVIPTypeVO> qiaoBiTenantVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO);
+
 }
 
 

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AssoTenantVipTypeMapper.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.mapper.qiaobi;
+
+import cn.cslg.permission.domain.qiaobi.AssoTenantVipType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author admin
+* @description 针对表【ASSO_TENANT_VIP_TYPE】的数据库操作Mapper
+* @createDate 2024-12-15 20:43:53
+* @Entity generator.domain.AssoTenantVipType
+*/
+public interface AssoTenantVipTypeMapper extends BaseMapper<AssoTenantVipType> {
+
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/BusinessTaskMapper.java

@@ -0,0 +1,23 @@
+package cn.cslg.permission.mapper.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskVO;
+import cn.cslg.permission.domain.qiaobi.BusinessTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @description 针对表【BUSINESS_TASK(业务任务表)】的数据库操作Mapper
+ * @createDate 2024-12-15 11:54:13
+ * @Entity generator.domain.BusinessTask
+ */
+public interface BusinessTaskMapper extends BaseMapper<BusinessTask> {
+
+    public List<QueryAuditTaskVO> queryAuditTask(QueryAuditTaskDTO queryAuditTaskDTO);
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/EnterpriseCodeMapper.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.mapper.qiaobi;
+
+import cn.cslg.permission.domain.qiaobi.EnterpriseCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author admin
+* @description 针对表【ENTERPRISE_CODE(企业码)】的数据库操作Mapper
+* @createDate 2024-12-13 11:24:49
+* @Entity generator.domain.EnterpriseCode
+*/
+public interface EnterpriseCodeMapper extends BaseMapper<EnterpriseCode> {
+
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/RegistInformationMapper.java

@@ -3,6 +3,8 @@ package cn.cslg.permission.mapper.qiaobi;
 import cn.cslg.permission.domain.qiaobi.RegistInformation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
 * @author admin
 * @description 针对表【REGIST_INFORMATION(注册信息表)】的数据库操作Mapper
@@ -10,7 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @Entity generator.domain.RegistInformation
 */
 public interface RegistInformationMapper extends BaseMapper<RegistInformation> {
-
+   public RegistInformation getRegistInformationByTaskId(Integer taskId);
 }
 
 

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

@@ -1,5 +1,6 @@
 package cn.cslg.permission.service;
 
+import cn.cslg.permission.common.model.qiaobi.QiaoBiGetDepartmentDTO;
 import cn.cslg.permission.common.model.vo.DepartmentInfoVO;
 import cn.cslg.permission.common.model.vo.DepartmentVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
@@ -12,6 +13,7 @@ import cn.cslg.permission.mapper.DepartmentMapper;
 import cn.cslg.permission.service.associate.DepartPosiService;
 import cn.cslg.permission.service.associate.DepartRoleService;
 import cn.cslg.permission.service.associate.PerDpService;
+import cn.cslg.permission.service.qiaobi.EnterpriseCodeService;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
@@ -43,6 +45,7 @@ public class DepartmentService extends ServiceImpl<DepartmentMapper, Department>
     private final PerDpService perDpService;
     private final CacheUtils cacheUtils;
     private final DepartmentMapper departmentMapper;
+    private final EnterpriseCodeService enterpriseCodeService;
 
     @Transactional(rollbackFor = Exception.class)
     public String addDepartment(DepartmentVO departmentVO) {
@@ -279,4 +282,27 @@ public class DepartmentService extends ServiceImpl<DepartmentMapper, Department>
         departmentInfoVO.setRoleList(departRoleService.getRoleListByDepartmentId(data.getId()));
         return Response.success(departmentInfoVO);
     }
+
+
+    public String getDepartmentListByCode(QiaoBiGetDepartmentDTO qiaoBiGetDepartmentDTO) {
+        String code = qiaoBiGetDepartmentDTO.getEnterpriseCode();
+        Integer tenantId = enterpriseCodeService.getTenantIdByCode(code);
+        LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();
+        //TODO 代码控制只能查看本租户内容
+        queryWrapper.eq(Department::getTenantId, tenantId);
+        List<Department> lst = this.list(queryWrapper);
+        return Response.success(treeGenerate(lst));
+    }
+
+    public List<Department> getDepartmentsByIds(List<Integer> ids){
+        List<Department> departmentList =new ArrayList<>();
+        if(ids==null||ids.size()==0) {
+            return departmentList;
+        }
+        LambdaQueryWrapper<Department> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.in(Department::getId,ids);
+        departmentList=this.list(queryWrapper);
+        return  departmentList;
+        }
+
 }

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

@@ -1,5 +1,6 @@
 package cn.cslg.permission.service;
 
+import cn.cslg.permission.common.model.qiaobi.QiaoBiGetDepartmentDTO;
 import cn.cslg.permission.common.model.vo.DepartmentInfoVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.model.vo.PositionInfoVO;
@@ -15,6 +16,7 @@ import cn.cslg.permission.mapper.PositionMapper;
 import cn.cslg.permission.service.associate.DepartPosiService;
 import cn.cslg.permission.service.associate.PerDpService;
 import cn.cslg.permission.service.associate.PositionRoleService;
+import cn.cslg.permission.service.qiaobi.EnterpriseCodeService;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +47,7 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
     private final PerDpService perDpService;
     private final TenantService tenantService;
     private final CacheUtils cacheUtils;
-
+    private final EnterpriseCodeService enterpriseCodeService;
     @Transactional(rollbackFor = Exception.class)
     public String addPosition(PositionVO positionVO) {
         log.info("开始处理【新增职位】的业务，参数为：{}", positionVO);
@@ -217,5 +219,24 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
         }
         return Response.success(positionVO);
     }
+    public String getPositionListByCode(QiaoBiGetDepartmentDTO qiaoBiGetDepartmentDTO) {
+      String code=qiaoBiGetDepartmentDTO.getEnterpriseCode();
+        Integer tenantId = enterpriseCodeService.getTenantIdByCode(code);
+        LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
+            //TODO 代码控制只能查看本租户内容
+            queryWrapper.eq(Position::getTenantId,tenantId);
+        List<Position> positionList = this.list(queryWrapper);
+        return Response.success(setPositionToVO(positionList));
+    }
 
+    public List<Position> getPositionByIds(List<Integer> ids){
+        List<Position> positionList =new ArrayList<>();
+        if(ids==null||ids.size()==0) {
+            return positionList;
+        }
+        LambdaQueryWrapper<Position> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.in(Position::getId,ids);
+        positionList=this.list(queryWrapper);
+        return  positionList;
+    }
 }

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

@@ -9,6 +9,9 @@ import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.SecurityUtils.SecurityUtils;
 import cn.cslg.permission.domain.Position;
 import cn.cslg.permission.domain.Role;
+import cn.cslg.permission.domain.associate.AssoPersonRole;
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.mapper.RoleMapper;
 import cn.cslg.permission.service.associate.*;
 import cn.dev33.satoken.stp.StpUtil;
@@ -24,6 +27,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author 沈永艺
@@ -64,6 +68,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
             e.printStackTrace();
         }
     }
+
     @Transactional(rollbackFor = Exception.class)
     public String deleteRole(RoleVO roleVO) {
         log.info("开始处理【删除角色】的业务，参数为：{}", roleVO);
@@ -108,8 +113,8 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
             //根据角色id查询角色，获得角色类型 （用于判断是否为管理员：1为系统管理员 2为租户管理员 0为普通角色）
             Integer roleType = this.getRoleType(roleVO.getId());
             //若为超级管理员或租户管理员则无法修改，返回错误提示
-            PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
-            if(personnelVO.getRoleType()!=1) {
+            PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+            if (personnelVO.getRoleType() != 1) {
                 if (roleType.equals(1)) {
                     return Response.error("无法修改系统管理员");
                 } else if (roleType.equals(2)) {
@@ -212,4 +217,70 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
 
     }
 
+    public List<Role> getRoleByPersonId(Integer personId, String applicationCode) {
+        List<Role> roleList = new ArrayList<>();
+        LambdaQueryWrapper<AssoPersonRole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoPersonRole::getPersonnelId, personId);
+        List<AssoPersonRole> assoPersonRoles = personRoleService.list(queryWrapper);
+
+        if (assoPersonRoles == null && assoPersonRoles.size() == 0) {
+            return roleList;
+        }
+        List<Integer> roleIds = assoPersonRoles.stream().map(AssoPersonRole::getRoleId).collect(Collectors.toList());
+
+        if (roleIds == null || roleIds.size() == 0) {
+            return roleList;
+        }
+        LambdaQueryWrapper<Role> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(Role::getId, roleIds);
+        if (applicationCode != null) {
+            queryWrapper1.eq(Role::getApplicationCode, applicationCode);
+        }
+        roleList = this.list(queryWrapper1);
+        return roleList;
+    }
+
+
+    public Integer checkLoginPersonRole() {
+        Integer personId = loginUtils.getId();
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(personId);
+        List<Role> roleList = this.getRoleByPersonId(personId,null);
+        if (roleList == null || roleList.size() == 0) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        Role role = roleList.stream().filter(item -> item.getRoleType().equals(1) || item.getRoleType().equals(2)).findFirst().orElse(null);
+        if (role == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        return personnelVO.getTenantId();
+    }
+
+    public Integer checkLoginPersonRole(String applicationId) {
+        Integer personId = loginUtils.getId();
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(personId);
+        List<Role> roleList = this.getRoleByPersonId(personId, null);
+        if (roleList == null || roleList.size() == 0) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        Role role = roleList.stream().filter(item -> item.getRoleType().equals(1) || item.getRoleType().equals(2)).findFirst().orElse(null);
+        if (role == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        return personnelVO.getTenantId();
+    }
+
+
+    public Integer checkApplicationRootRole(String applicationCode) {
+        Integer personId = loginUtils.getId();
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(personId);
+        List<Role> roleList = this.getRoleByPersonId(personId, applicationCode);
+        if (roleList == null || roleList.size() == 0) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        Role role = roleList.stream().filter(item -> item.getRoleType().equals(1)).findFirst().orElse(null);
+        if (role == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
+        }
+        return personnelVO.getTenantId();
+    }
 }

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

@@ -70,6 +70,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
             return -1;
         }
 
+
         //租户表保存租户信息
         Tenant tenant = new Tenant();
         tenant

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AppVipTypeService.java

@@ -44,6 +44,7 @@ public class AppVipTypeService extends ServiceImpl<AppVipTypeMapper, AppVipType>
     private final AssoTenantVipTypeFunctionService assoTenantVipTypeFunctionService;
     private final PersonnelService personnelService;
     private final LoginUtils loginUtils;
+    private EnterpriseCodeService enterpriseCodeService;
 
     public List<QiaoBiVIPTypeVO> qiaoBiVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO) {
         qiaoBiVipTypeDTO.setAppCode("4e95e3d926a2a4befa5d913acc0aa9f5");
@@ -52,7 +53,6 @@ public class AppVipTypeService extends ServiceImpl<AppVipTypeMapper, AppVipType>
     }
 
     /**
-     *
      * @param id
      * @return
      */
@@ -190,15 +190,21 @@ public class AppVipTypeService extends ServiceImpl<AppVipTypeMapper, AppVipType>
     }
 
     /**
-     *
      * @param ids
      */
     public void deleteByVipIds(List<Integer> ids) {
         LambdaQueryWrapper<AppVipType> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(AppVipType::getTenantVipTypeId, ids);
-         this.remove(queryWrapper);
+        this.remove(queryWrapper);
 
     }
+
+    public List<QiaoBiVIPTypeVO> qiaoBiTenantVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO) {
+        Integer tenantId = enterpriseCodeService.getTenantIdByCode(qiaoBiVipTypeDTO.getEnterpriseCode());
+        qiaoBiVipTypeDTO.setTenantId(tenantId);
+        List<QiaoBiVIPTypeVO> qiaoBiVIPTypeVOList = this.getBaseMapper().queryQiaobiVipTypeVOs(qiaoBiVipTypeDTO);
+        return qiaoBiVIPTypeVOList;
+    }
 }
 
 

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoPersonVipTypeService.java

@@ -127,6 +127,7 @@ public class AssoPersonVipTypeService extends ServiceImpl<AssoPersonVipTypeMappe
         if(vipId!=null){
             LambdaQueryWrapper<AssoPersonVipType> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AssoPersonVipType::getVipTypeId, vipId);
+//            queryWrapper.eq(AssoPersonVipType::getPersonId,personId);
              AssoPersonVipType assoPersonVipType =this.getOne(queryWrapper,false);
             expitrTime=assoPersonVipType.getExpitrTime();
           TenantVipType tenantVipType =  tenantVipTypeService.getById(vipId);

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoTenantVipTypeService.java

@@ -0,0 +1,116 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.UpdateTenantVipDTO;
+import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.cslg.permission.domain.qiaobi.AssoTenantVipType;
+import cn.cslg.permission.mapper.qiaobi.AssoTenantVipTypeMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author admin
+ * @description 针对表【ASSO_TENANT_VIP_TYPE】的数据库操作Service实现
+ * @createDate 2024-12-15 20:43:53
+ */
+@Service
+public class AssoTenantVipTypeService extends ServiceImpl<AssoTenantVipTypeMapper, AssoTenantVipType> {
+
+    public void updateTenantVipType(UpdateTenantVipDTO updateTenantVipDTO) {
+        Integer tenantId = updateTenantVipDTO.getTenantId();
+        List<VipTypeNumDTO> vipTypeNumDTOS = updateTenantVipDTO.getVipTypes();
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveFunctionModuleBatch(List<VipTypeNumDTO> vipTypeNumDTOS, Integer tenantId) {
+        if (vipTypeNumDTOS == null || vipTypeNumDTOS.size() == 0) {
+            return;
+        }
+
+        //将输入数据格式化成assoFunctionModules
+        List<AssoTenantVipType> assoTenantVipTypes = this.transDtoToVipTypeNums(vipTypeNumDTOS, tenantId);
+
+        //查询当前的版本代码
+        LambdaQueryWrapper<AssoTenantVipType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoTenantVipType::getTenantId, tenantId);
+        List<AssoTenantVipType> orgAssoTenantVipTypes = this.list(queryWrapper);
+
+        List<AssoTenantVipType> updateAssoTenantVipTypes = new ArrayList<>();
+
+        Iterator<AssoTenantVipType> assoIterator = assoTenantVipTypes.iterator();
+        while (assoIterator.hasNext()) {
+            AssoTenantVipType item = assoIterator.next();
+            if (orgAssoTenantVipTypes != null) {
+                Iterator<AssoTenantVipType> orgIterator = orgAssoTenantVipTypes.iterator();
+                while (orgIterator.hasNext()) {
+                    AssoTenantVipType tem = orgIterator.next();
+                    if (item.getVipTypeId().equals(tem.getVipTypeId())) {
+                        tem.setVipTypeNum(item.getVipTypeNum());
+                        updateAssoTenantVipTypes.add(tem);
+                        assoIterator.remove();
+                        orgIterator.remove();
+                    }
+                }
+
+            }
+        }
+
+
+        //删除版本代码
+        if (orgAssoTenantVipTypes != null && orgAssoTenantVipTypes.size() > 0) {
+            List<Integer> deleteIds = orgAssoTenantVipTypes.stream().map(AssoTenantVipType::getId).collect(Collectors.toList());
+            if (deleteIds != null && deleteIds.size() > 0) {
+                this.removeByIds(deleteIds);
+            }
+        }
+        //添加版本代码
+        this.saveAssos(assoTenantVipTypes);
+        //更新版本代码
+        this.updateAssos(orgAssoTenantVipTypes);
+    }
+
+
+    public void saveAssos(List<AssoTenantVipType> assoTenantVipTypes) {
+        if (assoTenantVipTypes != null && assoTenantVipTypes.size() > 0) {
+            this.saveBatch(assoTenantVipTypes);
+        }
+    }
+
+    public void updateAssos(List<AssoTenantVipType> assoTenantVipTypes) {
+        if (assoTenantVipTypes != null && assoTenantVipTypes.size() > 0) {
+            this.updateBatchById(assoTenantVipTypes);
+        }
+    }
+
+    public List<AssoTenantVipType> transDtoToVipTypeNums(List<VipTypeNumDTO> vipTypeNumDTOS, Integer tenantId) {
+        List<AssoTenantVipType> assoTenantVipTypes = new ArrayList<>();
+        if (vipTypeNumDTOS == null) {
+            return assoTenantVipTypes;
+        }
+        for (VipTypeNumDTO vipTypeNumDTO : vipTypeNumDTOS) {
+            AssoTenantVipType assoTenantVipType = new AssoTenantVipType();
+            assoTenantVipType.setTenantId(tenantId);
+            assoTenantVipType.setVipTypeId(vipTypeNumDTO.getVipTypeId());
+            assoTenantVipType.setVipTypeNum(vipTypeNumDTO.getVipTypeNum());
+        }
+        return assoTenantVipTypes;
+    }
+
+    public void  getTenantVipTypeByCode(){
+
+
+
+
+    }
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/service/qiaobi/BusinessTaskService.java

@@ -0,0 +1,220 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.AuditTaskDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO;
+import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskVO;
+import cn.cslg.permission.common.utils.LoginUtils;
+import cn.cslg.permission.domain.Department;
+import cn.cslg.permission.domain.Personnel;
+import cn.cslg.permission.domain.Position;
+import cn.cslg.permission.domain.qiaobi.BusinessTask;
+import cn.cslg.permission.domain.qiaobi.RegistInformation;
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
+import cn.cslg.permission.mapper.qiaobi.BusinessTaskMapper;
+import cn.cslg.permission.service.DepartmentService;
+import cn.cslg.permission.service.PersonnelService;
+import cn.cslg.permission.service.PositionService;
+import cn.cslg.permission.service.RoleService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import jdk.internal.org.jline.utils.ShutdownHooks;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author admin
+ * @description 针对表【BUSINESS_TASK(业务任务表)】的数据库操作Service实现
+ * @createDate 2024-12-15 11:54:13
+ */
+@Service
+@RequiredArgsConstructor
+public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, BusinessTask> {
+    private final PersonnelService personnelService;
+    private final DepartmentService departmentService;
+    private final PositionService positionService;
+    private final RoleService roleService;
+    private final RegistInformationService registInformationService;
+    private final AssoPersonVipTypeService assoPersonVipTypeService;
+    private final LoginUtils loginUtils;
+
+    public List<QueryAuditTaskVO> queryAuditTask(QueryAuditTaskDTO queryAuditTaskDTO) {
+        Integer tenantId = roleService.checkLoginPersonRole();
+        queryAuditTaskDTO.setTenantId(tenantId);
+        List<QueryAuditTaskVO> queryAuditTaskVOS = this.getBaseMapper().queryAuditTask(queryAuditTaskDTO);
+        this.loadQueryAuditTaskDTO(queryAuditTaskVOS);
+        return queryAuditTaskVOS;
+    }
+
+    private List<QueryAuditTaskVO> loadQueryAuditTaskDTO(List<QueryAuditTaskVO> queryAuditTaskVOS) {
+        if (queryAuditTaskVOS == null || queryAuditTaskVOS.size() == 0) {
+            return queryAuditTaskVOS;
+        }
+        List<Integer> personIds = new ArrayList<>();
+        List<Personnel> personnelList = new ArrayList<>();
+        List<Integer> departMentIds = new ArrayList<>();
+        List<Department> departmentList = new ArrayList<>();
+        List<Integer> positionIds = new ArrayList<>();
+        List<Position> positionList = new ArrayList<>();
+        queryAuditTaskVOS.forEach(item -> {
+            if (item.getCreateId() != null) {
+                personIds.add(item.getCreateId());
+            }
+            if (item.getDepartMentId() != null) {
+                departMentIds.add(item.getDepartMentId());
+            }
+            if (item.getHandleId() != null) {
+                personIds.add(item.getHandleId());
+            }
+            if (item.getPositionId() != null) {
+                positionIds.add(item.getPositionId());
+            }
+        });
+
+        if (personIds != null && personIds.size() > 0) {
+            personnelList = personnelService.getPersonByIds(personIds);
+        }
+        if (departMentIds != null || departMentIds.size() > 0) {
+            departmentList = departmentService.getDepartmentsByIds(departMentIds);
+        }
+        if (positionIds != null || positionIds.size() > 0) {
+            positionList = positionService.getPositionByIds(positionIds);
+        }
+
+        for (QueryAuditTaskVO queryAuditTaskVO : queryAuditTaskVOS) {
+            Personnel createUser = personnelList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getCreateId())).findFirst().orElse(null);
+            if (createUser != null) {
+                queryAuditTaskVO.setCreateName(createUser.getPersonnelName());
+            }
+            Personnel handlerUser = personnelList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getHandleId())).findFirst().orElse(null);
+            if (handlerUser != null) {
+                queryAuditTaskVO.setHandleName(handlerUser.getPersonnelName());
+            }
+            Department department = departmentList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getDepartMentId())).findFirst().orElse(null);
+            if (department != null) {
+                queryAuditTaskVO.setDepartMentName(department.getDepartmentName());
+            }
+            Position position = positionList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getPositionId())).findFirst().orElse(null);
+            if (position != null) {
+                queryAuditTaskVO.setPositionName(position.getPositionName());
+            }
+        }
+        return queryAuditTaskVOS;
+    }
+
+    public List<BusinessTask> queryBusinessTaskByIds(List<Integer> taskIds) {
+        LambdaQueryWrapper<BusinessTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(BusinessTask::getId, taskIds);
+        List<BusinessTask> businessTasks = this.list(queryWrapper);
+        return businessTasks;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void auditTasks(AuditTaskDTO auditTaskDTO) {
+        List<Integer> taskIds = auditTaskDTO.getTaskIds();
+        if (taskIds == null || taskIds.size() == 0) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "请选择至少一个任务");
+        }
+        Integer result = auditTaskDTO.getResult();
+        //根据taskId 查询任务
+        Integer tenantId = roleService.checkLoginPersonRole();
+        List<BusinessTask> businessTasks = this.queryBusinessTaskByIds(taskIds);
+        businessTasks = businessTasks.stream().filter(item -> item.getTenantId().equals(tenantId)).collect(Collectors.toList());
+        businessTasks.forEach(item -> {
+            this.auditTask(item, result);
+        });
+    }
+
+
+    public void auditTask(BusinessTask businessTask, Integer result) {
+        Integer type = businessTask.getTaskType();
+        switch (type) {
+            case 1:
+                this.auditSignUpTask(businessTask, result);
+                break;
+            case 2:
+                this.auditVersionTask(businessTask, result);
+                break;
+            default:
+                throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "任务类型不存在");
+        }
+
+    }
+
+    public void auditSignUpTask(BusinessTask businessTask, Integer result) {
+        if (result == 1) {
+            this.auditSignUpTaskPass(businessTask);
+        } else {
+            this.auditSignUpTaskNotPass(businessTask);
+        }
+
+    }
+
+    public void updateAuditTaskResult(BusinessTask businessTask, Integer result) {
+        businessTask.setStatus(1);
+        businessTask.setResult(result);
+        businessTask.setHandleId(loginUtils.getId());
+        businessTask.updateById();
+    }
+
+    public void auditSignUpTaskPass(BusinessTask businessTask) {
+        //查询人员注册信息
+        Integer taskId = businessTask.getTaskType();
+        RegistInformation registInformation = registInformationService.getRegistInformationByTaskId(taskId);
+        if (registInformation == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "任务无注册信息");
+        }
+        Integer vipTypeId = registInformation.getVipTypeId();
+        QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = this.transFormToQiaoBiPersonSignUpDTO(registInformation);
+        qiaoBiPersonSignUpDTO = personnelService.addPhoneSignUpPerson(qiaoBiPersonSignUpDTO);
+        //绑定版本
+        assoPersonVipTypeService.addVip(qiaoBiPersonSignUpDTO.getId(), vipTypeId, null);
+        this.updateAuditTaskResult(businessTask, 1);
+    }
+
+    public void auditSignUpTaskNotPass(BusinessTask businessTask) {
+
+        this.updateAuditTaskResult(businessTask, 0);
+    }
+
+    public void auditVersionTask(BusinessTask businessTask, Integer result) {
+        if (result == 1) {
+            this.auditVersionTaskPass(businessTask);
+        } else {
+            this.auditVersionTaskNotPass(businessTask);
+        }
+
+    }
+
+    public void auditVersionTaskPass(BusinessTask businessTask) {
+        roleService.checkApplicationRootRole("4e95e3d926a2a4befa5d913acc0bb8t6");
+        this.updateAuditTaskResult(businessTask, 1);
+    }
+
+    public void auditVersionTaskNotPass(BusinessTask businessTask) {
+
+        this.updateAuditTaskResult(businessTask, 0);
+    }
+
+    public QiaoBiPersonSignUpDTO transFormToQiaoBiPersonSignUpDTO(RegistInformation registInformation) {
+        QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = new QiaoBiPersonSignUpDTO();
+        qiaoBiPersonSignUpDTO.setEmail(registInformation.getPersonnelEmail());
+        qiaoBiPersonSignUpDTO.setUsername(registInformation.getPersonnelUsername());
+        qiaoBiPersonSignUpDTO.setPhoneNum(registInformation.getPersonnelPhone());
+        qiaoBiPersonSignUpDTO.setPassword(registInformation.getPersonnelPassword());
+        qiaoBiPersonSignUpDTO.setName(registInformation.getPersonnelName());
+        return qiaoBiPersonSignUpDTO;
+    }
+
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/service/qiaobi/EnterpriseCodeService.java

@@ -0,0 +1,31 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.cslg.permission.domain.qiaobi.EnterpriseCode;
+import cn.cslg.permission.mapper.qiaobi.EnterpriseCodeMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author admin
+* @description 针对表【ENTERPRISE_CODE(企业码)】的数据库操作Service实现
+* @createDate 2024-12-13 11:24:49
+*/
+@Service
+public class EnterpriseCodeService extends ServiceImpl<EnterpriseCodeMapper, EnterpriseCode> {
+    public Integer getTenantIdByCode(String code){
+        LambdaQueryWrapper<EnterpriseCode> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(EnterpriseCode::getCode,code);
+        EnterpriseCode enterpriseCode =this.getOne(queryWrapper,false);
+        if(enterpriseCode==null){
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR,"企业码不存在");
+        }
+        return  enterpriseCode.getTenantId();
+    }
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/service/qiaobi/PaidCodeService.java

@@ -3,6 +3,7 @@ package cn.cslg.permission.service.qiaobi;
 import cn.cslg.permission.common.core.business.LoginCacheKeyUtil;
 import cn.cslg.permission.common.model.Records;
 import cn.cslg.permission.common.model.dto.SendCodeDTO;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.paidCode.*;
 import cn.cslg.permission.common.model.vo.AppVipTypeVO;
 import cn.cslg.permission.common.model.vo.TenantVO;
@@ -17,6 +18,7 @@ import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.mapper.qiaobi.PaidCodeMapper;
 import cn.cslg.permission.service.LoginService;
 import cn.cslg.permission.service.PersonnelService;
+import cn.cslg.permission.service.TenantService;
 import cn.hutool.core.img.LabColor;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,6 +48,8 @@ public class PaidCodeService extends ServiceImpl<PaidCodeMapper, PaidCode> {
     private final RegistInformationService registInformationService;
     private final LoginService loginService;
     private final RedisUtil redisUtil;
+    private final QiaoBiPersonService qiaoBiPersonService;
+    private TenantService tenantService;
 
     /**
      * 添加付费码
@@ -275,7 +279,7 @@ public class PaidCodeService extends ServiceImpl<PaidCodeMapper, PaidCode> {
     }
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void addTenantByPaidCode(AddTenantByPaidCodeDTO addTenantByPaidCodeDTO) {
         String token = addTenantByPaidCodeDTO.getToken();
         //根据token获得付费码
@@ -284,6 +288,20 @@ public class PaidCodeService extends ServiceImpl<PaidCodeMapper, PaidCode> {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "未通过验证");
         }
 
+        QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = new QiaoBiPersonSignUpDTO();
+        qiaoBiPersonSignUpDTO.setPhoneNum(addTenantByPaidCodeDTO.getPersonnelPhone());
+        qiaoBiPersonSignUpDTO.setUsername(addTenantByPaidCodeDTO.getPersonnelUserName());
+        qiaoBiPersonSignUpDTO.setEmail(addTenantByPaidCodeDTO.getPersonnelEmail());
+        qiaoBiPersonService.checkPersonInvalid(qiaoBiPersonSignUpDTO);
+        TenantVO tenantVO = this.transToTenantVO(addTenantByPaidCodeDTO);
+        tenantService.addTenant(tenantVO);
+        PaidCode paidCode = this.getPaidCodeByCode(code);
+        PaidCodeStatusDTO paidCodeStatusDTO = new PaidCodeStatusDTO();
+        paidCodeStatusDTO.setId(paidCode.getId());
+        paidCodeStatusDTO.setStatus(2);
+        updatePaidCodeStatus(paidCodeStatusDTO);
+
+
     }
 
     public TenantVO transToTenantVO(AddTenantByPaidCodeDTO addTenantByPaidCodeDTO) {
@@ -294,8 +312,19 @@ public class PaidCodeService extends ServiceImpl<PaidCodeMapper, PaidCode> {
         tenantVO.setType(addTenantByPaidCodeDTO.getTenantType().toString());
         tenantVO.setPassword(addTenantByPaidCodeDTO.getPersonnelPassword());
         tenantVO.setCompanyName(addTenantByPaidCodeDTO.getTenantName());
+        tenantVO.setTenantVipType(31);
         return tenantVO;
     }
+
+    public PaidCode getPaidCodeByCode(String code) {
+        LambdaQueryWrapper<PaidCode> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PaidCode::getCode, code);
+        PaidCode paidCode = this.getOne(queryWrapper, false);
+        if (paidCode == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "付费码不存在");
+        }
+        return paidCode;
+    }
 }
 
 

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiPersonService.java

@@ -5,6 +5,7 @@ import cn.cslg.permission.common.core.business.SmsService;
 import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.CompanyPersonSignUpDTO;
 import cn.cslg.permission.common.model.vo.LoginVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.RedisUtil;
@@ -12,6 +13,8 @@ import cn.cslg.permission.common.utils.RegexUtil;
 import cn.cslg.permission.common.utils.StringUtils;
 import cn.cslg.permission.domain.PersonInvitationCode;
 import cn.cslg.permission.domain.Personnel;
+import cn.cslg.permission.domain.qiaobi.BusinessTask;
+import cn.cslg.permission.domain.qiaobi.RegistInformation;
 import cn.cslg.permission.exception.ExceptionEnum;
 import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.service.LoginService;
@@ -38,8 +41,9 @@ public class QiaoBiPersonService {
     @Autowired
     private SmsService smsService;
     @Autowired
-    private LoginService loginService;
-
+    private EnterpriseCodeService enterpriseCodeService;
+    @Autowired
+    private RegistInformationService registInformationService;
     @Transactional(rollbackFor = Exception.class)
     public QiaoBiPersonSignUpDTO personSignUp(QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
         String phoneNum = qiaoBiPersonSignUpDTO.getPhoneNum();
@@ -110,7 +114,7 @@ public class QiaoBiPersonService {
      *
      * @param qiaoBiPersonSignUpDTO
      */
-    private void checkPersonInvalid(QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
+    public void checkPersonInvalid(QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
         String phoneNum = qiaoBiPersonSignUpDTO.getPhoneNum();
         String username = qiaoBiPersonSignUpDTO.getUsername();
         String email = qiaoBiPersonSignUpDTO.getEmail();
@@ -140,39 +144,58 @@ public class QiaoBiPersonService {
 
     /**
      * 窍笔后台账号密码登录
+     *
      * @param loginVO
      * @param systemId
      * @return
      */
-    public PersonnelVO backAccountLogin(LoginVO loginVO,Integer systemId) {
+    public PersonnelVO backAccountLogin(LoginVO loginVO, Integer systemId) {
         String userName = loginVO.getUsername();
         String password = loginVO.getPassword();
         //检查账号密码
-        Personnel personnel = personnelService.checkLoginPersonAccount(loginVO,systemId);
+        Personnel personnel = personnelService.checkLoginPersonAccount(loginVO, systemId);
         //检查登录人信息
-        personnelService.loginCheckPerson(personnel,systemId);
+        personnelService.loginCheckPerson(personnel, systemId);
         //检查租户信息
-        personnelService.loginCheckTenant(personnel,systemId);
+        personnelService.loginCheckTenant(personnel, systemId);
         //Sa-token 登录方法 登录后 生成Token 如果集成了Redis的话 会自动存入Redis
-        PersonnelVO personnelVO= personnelService.commonPersonLoginSuccess(personnel,systemId);
-            return personnelVO;
+        PersonnelVO personnelVO = personnelService.commonPersonLoginSuccess(personnel, systemId);
+        return personnelVO;
     }
 
 
     /**
      * 窍笔后台手机号登录
+     *
      * @param phoneLoginDTO
      * @param systemId
      * @return
      */
 
     public PersonnelVO backPhoneLogin(PhoneLoginDTO phoneLoginDTO, Integer systemId) {
-      Personnel personnel=  personnelService.loginPhoneCheck(phoneLoginDTO,systemId);
+        Personnel personnel = personnelService.loginPhoneCheck(phoneLoginDTO, systemId);
         //检查登录人信息
-        personnelService.loginCheckPerson(personnel,systemId);
+        personnelService.loginCheckPerson(personnel, systemId);
         //检查租户信息
-        personnelService.loginCheckTenant(personnel,systemId);
-        PersonnelVO personnelVO= personnelService.commonPersonLoginSuccess(personnel,systemId);
+        personnelService.loginCheckTenant(personnel, systemId);
+        PersonnelVO personnelVO = personnelService.commonPersonLoginSuccess(personnel, systemId);
         return personnelVO;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void companyPersonSignUp(CompanyPersonSignUpDTO companyPersonSignUpDTO) {
+        //企业码是否存在
+        Integer tenantId = enterpriseCodeService.getTenantIdByCode(companyPersonSignUpDTO.getEnterpriseCode());
+        QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = new QiaoBiPersonSignUpDTO();
+        qiaoBiPersonSignUpDTO.setPhoneNum(companyPersonSignUpDTO.getPersonnelPhone());
+        qiaoBiPersonSignUpDTO.setUsername(companyPersonSignUpDTO.getPersonnelUserName());
+        qiaoBiPersonSignUpDTO.setEmail(companyPersonSignUpDTO.getPersonnelEmail());
+        this.checkPersonInvalid(qiaoBiPersonSignUpDTO);
+      RegistInformation registInformation= registInformationService.addRegistInformation(companyPersonSignUpDTO);
+        BusinessTask businessTask =new BusinessTask();
+        businessTask.setTaskType(1);
+        businessTask.setStatus(0);
+        businessTask.setTenantId(tenantId);
+        businessTask.insert();
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/RegistInformationService.java

@@ -1,7 +1,9 @@
 package cn.cslg.permission.service.qiaobi;
 
+import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.paidCode.AddTenantByPaidCodeDTO;
 import cn.cslg.permission.common.model.qiaobi.paidCode.PaidCodeAddDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.CompanyPersonSignUpDTO;
 import cn.cslg.permission.domain.qiaobi.AssoPaidCodeRegistInfo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,41 +14,52 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 /**
-* @author admin
-* @description 针对表【REGIST_INFORMATION(注册信息表)】的数据库操作Service实现
-* @createDate 2024-12-09 15:16:11
-*/
+ * @author admin
+ * @description 针对表【REGIST_INFORMATION(注册信息表)】的数据库操作Service实现
+ * @createDate 2024-12-09 15:16:11
+ */
 @Service
 @RequiredArgsConstructor
 public class RegistInformationService extends ServiceImpl<RegistInformationMapper, RegistInformation> {
-private final  AssoPaidCodeRegistInfoService assoPaidCodeRegistInfoService;
-    public  RegistInformation addRegistInformation(PaidCodeAddDTO paidCodeAddDTO){
-        RegistInformation registInformation =new RegistInformation();
-        BeanUtils.copyProperties(paidCodeAddDTO,registInformation);
+    private final AssoPaidCodeRegistInfoService assoPaidCodeRegistInfoService;
+
+    public RegistInformation addRegistInformation(PaidCodeAddDTO paidCodeAddDTO) {
+        RegistInformation registInformation = new RegistInformation();
+        BeanUtils.copyProperties(paidCodeAddDTO, registInformation);
         registInformation.insert();
-        return  registInformation;
+        return registInformation;
     }
 
+    public RegistInformation addRegistInformation(CompanyPersonSignUpDTO companyPersonSignUpDTO) {
+        RegistInformation registInformation = new RegistInformation();
+        BeanUtils.copyProperties(companyPersonSignUpDTO, registInformation);
+        registInformation.insert();
+        return registInformation;
+    }
 
 
-    public  RegistInformation updateRegistInformation(PaidCodeAddDTO paidCodeAddDTO){
+    public RegistInformation updateRegistInformation(PaidCodeAddDTO paidCodeAddDTO) {
         //根据paidCodeId 查询注册信息id
-        Integer paidCodeId =paidCodeAddDTO.getId();
-        LambdaQueryWrapper<AssoPaidCodeRegistInfo> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoPaidCodeRegistInfo::getPaidCodeId,paidCodeId);
-        AssoPaidCodeRegistInfo assoPaidCodeRegistInfo =assoPaidCodeRegistInfoService.getOne(queryWrapper,false);
+        Integer paidCodeId = paidCodeAddDTO.getId();
+        LambdaQueryWrapper<AssoPaidCodeRegistInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoPaidCodeRegistInfo::getPaidCodeId, paidCodeId);
+        AssoPaidCodeRegistInfo assoPaidCodeRegistInfo = assoPaidCodeRegistInfoService.getOne(queryWrapper, false);
 
         //获取注册信息id
-        Integer registInfoId =assoPaidCodeRegistInfo.getRegistInfoId();
+        Integer registInfoId = assoPaidCodeRegistInfo.getRegistInfoId();
 
-        RegistInformation registInformation =this.getById(registInfoId);
-        BeanUtils.copyProperties(paidCodeAddDTO,registInformation);
+        RegistInformation registInformation = this.getById(registInfoId);
+        BeanUtils.copyProperties(paidCodeAddDTO, registInformation);
         registInformation.setId(registInfoId);
         registInformation.updateById();
-        return  registInformation;
+        return registInformation;
     }
 
-
+    public RegistInformation getRegistInformationByTaskId(Integer taskId) {
+        //根据paidCodeId 查询注册信息id
+        RegistInformation registInformation = this.getBaseMapper().getRegistInformationByTaskId(taskId);
+        return registInformation;
+    }
 }
 
 

PCS/src/main/resources/application-prodNetOut.yml

@@ -47,4 +47,5 @@ inviteSignInLink: http://47.116.194.135:8078/register
 SMS:
   regionId: cn-shanghai
   accessKeyId: LTAI5tGyG1Q7fKprgg1nWhXj
-  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
+  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
+FMSUrl: http://192.168.2.24:8803

PCS/src/main/resources/mapper/AppVipTypeMapper.xml

@@ -89,4 +89,15 @@
             </if>
         </where>
     </select>
+
+
+    <select id="qiaoBiTenantVIPTypeVOList" resultType="cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO">
+        select vip.ID as vipTypeId,vip.TENANT_VIP_NAME as vipTypeName from ASSO_TENANT_VIP_TYPE as app left join TENANT_VIP_TYPE
+        as vip on
+        app.VIP_TYPE_ID = vip.ID
+        <where>
+            app.TENANT_ID=#{tenantId}
+
+        </where>
+    </select>
 </mapper>

PCS/src/main/resources/mapper/AssoTenantVipTypeMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cslg.permission.mapper.qiaobi.AssoTenantVipTypeMapper">
+
+
+</mapper>

PCS/src/main/resources/mapper/BusinessTaskMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cslg.permission.mapper.qiaobi.BusinessTaskMapper">
+
+
+
+    <select id="queryAuditTask" resultType="cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO">
+        select bt.ID as id,
+               bt.CREATE_TIME as createTime,
+               bt.CREATE_ID as createId,
+               bt.HANDLE_ID as handleId,
+               bt.RESULT as auditResult,
+               bt.STATUS as status,
+               bt.TYPE as type,
+               ri.DEPARTMENT_ID as departmentId,
+               ri.POSITION_ID as positionId,
+               ri.PERSONNEL_NAME as personnelName,
+               ri.PERSONNEL_USERNAME as personnelUserName,
+               ri.PERSONNEL_PASSWORD as personnelPassword
+        from BUSINESS_TASK bt left join ASSO_BUSINESS_TASK_REGIST_INFO abtri on bt.ID = abtri.BUSINESS_TASK_ID
+        left join REGIST_INFORMATION ri on abtri.REGIST_INFO_ID=ri.ID
+       <where>
+       <if test="status!=null">
+        and   bt.STATUS=#{status}
+       </if>
+           <if test="type!=null">
+           and    bt.TYPE=#{type}
+           </if>
+           <if test="auditResult!=null">
+               and    bt.RESULT=#{auditResult}
+           </if>
+       </where>
+    </select>
+</mapper>

PCS/src/main/resources/mapper/EnterpriseCodeMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cslg.permission.mapper.qiaobi.EnterpriseCodeMapper">
+
+    <select id="getEntrustsOrder" resultType="cn.cslg.permission.common.model.vo.EntrustVO">
+        select *
+        from (select id as entrustId, NAME as name, 1 as entrustType
+        from CLIENT
+        union all
+        select id as entrustId, DEPARTMENT_NAME as name, 2 as entrustType
+        from PCS_TEST.DEPARTMENT) as c
+        order by name
+        <if test="orderType==0">
+            asc
+        </if>
+        <if test="orderType!=0">
+            desc
+        </if>
+    </select>
+</mapper>

PCS/src/main/resources/mapper/RegistInformationMapper.xml

@@ -3,22 +3,11 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.cslg.permission.mapper.qiaobi.RegistInformationMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.permission.domain.qiaobi.RegistInformation">
-            <result property="id" column="ID" jdbcType="INTEGER"/>
-            <result property="tenantName" column="TENANT_NAME" jdbcType="VARCHAR"/>
-            <result property="tenantType" column="TENANT_TYPE" jdbcType="INTEGER"/>
-            <result property="tenantAddress" column="TENANT_ADDRESS" jdbcType="VARCHAR"/>
-            <result property="personnelName" column="PERSONNEL_NAME" jdbcType="VARCHAR"/>
-            <result property="personnelPhone" column="PERSONNEL_PHONE" jdbcType="VARCHAR"/>
-            <result property="personnelEmail" column="PERSONNEL_EMAIL" jdbcType="VARCHAR"/>
-            <result property="personnelUsername" column="PERSONNEL_USERNAME" jdbcType="VARCHAR"/>
-            <result property="personnelPassword" column="PERSONNEL_PASSWORD" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        ID,TENANT_NAME,TENANT_TYPE,
-        TENANT_ADDRESS,PERSONNEL_NAME,PERSONNEL_PHONE,
-        PERSONNEL_EMAIL,PERSONNEL_USERNAME,PERSONNEL_PASSWORD
-    </sql>
+    <select id="getRegistInformationByTaskId" resultType="cn.cslg.permission.domain.qiaobi.RegistInformation">
+        select ri.* from ASSO_BUSINESS_TASK_REGIST_INFO abtri left join REGIST_INFORMATION ri
+        on  abtri.REGIST_INFO_ID =ri.ID
+        <where>
+                and abtri.BUSINESS_TASK_ID =#{taskId}
+        </where>
+    </select>
 </mapper>

PCS/src/main/resources/mapper/TenantMapper.xml

@@ -89,4 +89,22 @@
         where TENANT_VIP_TYPE = #{tenantVipType}
     </update>
 
+
+    <select id="queryQiaoBiTenants" resultType="int">
+        select t.TENANT_NAME as name,
+               t.TENANT_DESCRIPTION as 'describe',
+        t.ID as id,
+               t.TENANT_CONTACT_NUMBER as number,
+               t.TENANT_STATUS as state,
+               t.TENANT_TYPE as type,
+               p.PERSONNEL_NAME as userName,
+               p.PERSONNEL_EMAIL as email
+        from TENANT t
+      left join PERSONNEL p on t.PERSONNEL_ID=p.ID
+<where>
+    <if test="tenantId!=null">
+        t.ID=#{tenantId}
+    </if>
+</where>
+    </select>
 </mapper>

PCS/src/test/java/cn/cslg/permission/EncryptionPersonTest.java

@@ -34,11 +34,11 @@ public class EncryptionPersonTest {
     @Test
     public void test() throws Exception {
         EncryptionLoginDTO vo = new EncryptionLoginDTO();
-        vo.setUsername("zhangsansan");
-        vo.setPassword("12343545");
+        vo.setUsername("admin");
+        vo.setPassword("xiaoshi221101");
         vo.setAppKey("4e95e3d926a2a4befa5d913acc0aa9f5");
 //        vo.setMachineCode("BDACEARQ1241241");
-        vo.setMachineCode("BFEBFBFF000A0654");
+        vo.setMachineCode("b4120f3606dfda03c341e8f8b1414ec3");
         final long timeMillis = System.currentTimeMillis();
         vo.setCurrentTimeMillis(timeMillis);
         String appSecret = vo.getAppKey() + timeMillis / 1000;