跨租户限制调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/mapper/FinanceInvoiceInvalidMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity com.jeeplus.test.finance.invoice.domain.FinanceInvoiceInvalid
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface FinanceInvoiceInvalidMapper extends BaseMapper<FinanceInvoiceInvalid> {
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/mapper/FinanceInvoiceMapper.java

@@ -17,11 +17,11 @@ import org.apache.ibatis.annotations.Param;
  * @Entity com.jeeplus.test.finance.invoice.domain.FinanceInvoice
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface FinanceInvoiceMapper extends BaseMapper<FinanceInvoice> {
 
     IPage<FinanceInvoiceDTO> findList(Page<FinanceInvoiceDTO> page, @Param(Constants.WRAPPER) QueryWrapper<FinanceInvoice> queryWrapper);
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     FinanceInvoiceDTO queryById(@Param("id") String id);
 
     /**

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -279,23 +279,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 return new Page<FinanceInvoiceDTO>();
             }
         }
-        //获取当前登录人信息
-        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
-        //获取当前登录人所属角色
-        //若是评估部门主任，则仅展示部门主任信息
-        //若是评估员工，则仅展示自己的数据信息
-                List<RoleDTO> roleDTOList = userDTO.getRoleDTOList();
-                for (RoleDTO roleDTO : roleDTOList) {
-                    //根据角色id查询角色信息
-                    RoleDTO roleDTOById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
-                    if("yg".equals(roleDTOById.getEnName()) && "评估员工".equals(roleDTOById.getName())){
-                        queryWrapper.eq("fi.create_by_id", userDTO.getId());
-                        break;
-                    }else if("bmzr".equals(roleDTOById.getEnName()) && "评估部门主任".equals(roleDTOById.getName())){
-                        queryWrapper.eq("su.office_id", userDTO.getOfficeDTO().getId());
-                        break;
-                    }
-                }
+
         IPage<FinanceInvoiceDTO> pageList = financeInvoiceMapper.findList(page, queryWrapper);
         pageList.getRecords().stream().forEach(item ->{
             // 发票申请

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProgramReportNoMapper.java

@@ -13,6 +13,7 @@ public interface ProgramReportNoMapper extends BaseMapper<ProgramReportNo> {
 
     /**
      * 根据项目id查报告号信息
+     * 过滤限制保留
      * @param id
      * @return
      */

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProjectLinkMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ProjectLinkMapper extends BaseMapper<ProgramProjectListLink> {
 
     void deleteByInfoId(@Param("id") String id);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -24,7 +24,7 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
 
     void updateStatusById(@Param("id")String id, @Param("status")String status);
 
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
     /**
      * 项目登记列表,和上面findPageList接口是一样的，目的时跳过findPageList mapper接口的数据规则（比如仅部门可见、仅自己可见之类的）
@@ -46,6 +46,7 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
 
     /**
      * 根据id集合查询项目信息
+     * 过滤限制保留
      * @param idList
      * @return
      */

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/serviceType/mapper/ProgramServiceTypeMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ProgramServiceTypeMapper extends BaseMapper<ProgramServiceType> {
 
     IPage<ProgramServiceTypeDTO> findList(Page<ProgramServiceTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramServiceType> queryWrapper);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/mapper/ProjectMapper.java

@@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ProjectMapper extends BaseMapper<Project> {
 
     public Project selectByDocumentNum(ProjectDTO projectDTO);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementAmountInfoMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.ReimbursementAmountInfo;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementAmountInfoMapper extends BaseMapper<ReimbursementAmountInfo> {
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementDetailInfoContractMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity com.jeeplus.test.reimbursement.reimbursementInfo.domain.ReimbursementDetailInfoContract
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementDetailInfoContractMapper extends BaseMapper<ReimbursementDetailInfoContract> {
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementDetailInfoMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.ReimbursementDetailInfo;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementDetailInfoMapper extends BaseMapper<ReimbursementDetailInfo> {
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementDetailInfoOtherMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity com.jeeplus.test.reimbursement.reimbursementInfo.domain.ReimbursementDetailInfoOther
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementDetailInfoOtherMapper extends BaseMapper<ReimbursementDetailInfoOther> {
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementDetailInfoProcuredMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity com.jeeplus.test.reimbursement.reimbursementInfo.domain.ReimbursementDetailInfoProcured
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementDetailInfoProcuredMapper extends BaseMapper<ReimbursementDetailInfoProcured> {
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
 
     IPage<RetureListDto> findList (Page<RetureListDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
@@ -46,6 +46,13 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
 
     List<ReimbursementDetailInfoProcured> getProcuredDetailList(@Param("id") String id);
 
+    /**
+     * 查询详情列表
+     * 过滤限制保留
+     * @param id
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
     List<ReimbursementDetailInfo> getDetailList(@Param("id") String id);
 
     /**

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -19,6 +19,7 @@ import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.*;
 //import com.jeeplus.sys.mapper.OfficeMapper;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.sys.utils.DictUtils;
@@ -176,7 +177,7 @@ public class ReimbursementInfoService {
             queryWrapper.eq("a.source_type", dto.getSourceType());
         }
         //获取当前登录人信息
-        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+        /*UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色
         //若是评估部门主任，则仅展示部门主任信息
         //若是评估员工，则仅展示自己的数据信息
@@ -191,7 +192,7 @@ public class ReimbursementInfoService {
                 queryWrapper.eq("c.office_id", userDTO.getOfficeDTO().getId());
                 break;
             }
-        }
+        }*/
 
 
         IPage<RetureListDto> pageList = infoMapper.findList(page, queryWrapper);
@@ -484,7 +485,7 @@ public class ReimbursementInfoService {
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
             if(StringUtils.isNotBlank(info.getDepartment())) {
-                Office byId = SpringUtil.getBean ( IOfficeApi.class ).selectById(info.getDepartment());
+                OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {
                     dto.setDepartmentName(byId.getName());
                 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementDetailInfoContractMapper.java

@@ -5,6 +5,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoContract;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementDetailInfoContractMapper extends BaseMapper<ZsReimbursementDetailInfoContract> {
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementDetailInfoMapper.java

@@ -9,6 +9,6 @@ import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfo;
  * @author: 王强
  * @create: 2022-11-24 16:31
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementDetailInfoMapper extends BaseMapper<ZsReimbursementDetailInfo> {
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementDetailInfoOtherMapper.java

@@ -5,6 +5,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoOther;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementDetailInfoOtherMapper extends BaseMapper<ZsReimbursementDetailInfoOther> {
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementDetailInfoProcuredMapper.java

@@ -5,6 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoProcured;
 
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementDetailInfoProcuredMapper extends BaseMapper<ZsReimbursementDetailInfoProcured> {
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementDetailInfoReportMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoReport;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementDetailInfoReportMapper extends BaseMapper<ZsReimbursementDetailInfoReport> {
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementInfoMapper.java

@@ -19,13 +19,13 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-24 16:09
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ZsReimbursementInfoMapper extends BaseMapper<ZsReimbursementInfo> {
 
     IPage<ZSProgramProjectListInfo> findProjectList(Page<ZSProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ZSProgramProjectListInfo> wrapper);
 
     String selectInvoiceFlag(@Param("id") String id);
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<ZsRetureListDto> findList (Page<ZsRetureListDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-29 14:20
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
     /**
      * 根据合同id查询纸质归档信息

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-08 10:47
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     ContractInfo getInfoById(String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/CwWorkContractBorrowMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-27 13:52
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwWorkContractBorrowMapper extends BaseMapper<CwWorkContractBorrow> {
 
     void updateStatusById(@Param("id") String id, @Param("borrowType")String borrowType);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/CwFinanceInvoiceInvalidMapper.java

@@ -6,7 +6,7 @@ import com.jeeplus.finance.invoice.domain.CwFinanceInvoiceInvalid;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwFinanceInvoiceInvalidMapper extends BaseMapper<CwFinanceInvoiceInvalid> {
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/CwFinanceInvoiceMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwFinanceInvoiceMapper extends BaseMapper<CwFinanceInvoice> {
 
     public IPage<CwFinanceInvoiceDTO> findList(Page<CwFinanceInvoiceDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwFinanceInvoice> queryWrapper, @Param("officeIds") String officeIds);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/mapper/CwProjectBusinessTypeMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectBusinessTypeMapper extends BaseMapper<CwProjectBusinessType> {
 
     public IPage<CwProjectBusinessTypeDTO> findList(Page<CwProjectBusinessTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectBusinessType> queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwManHourManagementMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @version: 2022-11-10 14:56
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwManHourManagementMapper extends BaseMapper<CwManHourManagement> {
     /**
      * 查询项目数据集合

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectClientInfoMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity generator.domain.CwProjectClientInfo
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectClientInfoMapper extends BaseMapper<CwProjectClientInfo> {
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -51,7 +51,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     public IPage<CwWorkClientBaseDTO> findClineList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportReviewMapper.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @create: 2022-12-12 20:35
  **/
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportReviewMapper extends BaseMapper<CwProjectReview> {
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/CwProjectReportArchiveDetailMapper.java

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportArchiveDetailMapper extends BaseMapper<CwProjectReportArchiveDetail> {
 
     IPage<CwProjectReportArchiveDetailDTO> findList(Page<CwProjectReportArchiveDetailDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchiveDetail> queryWrapper, @Param("cwProjectReportArchiveDetailDTO") CwProjectReportArchiveDetailDTO cwProjectReportArchiveDetailDTO);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/CwProjectReportArchiveMapper.java

@@ -15,9 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReportArchive> {
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper, @Param("sta") String sta);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/mapper/CwProofreadTypeMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-12-08 09:19
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProofreadTypeMapper extends BaseMapper<CwProofreadType>, TreeMapper<CwProofreadType> {
     @InterceptorIgnore(tenantLine = "true")
     List<CwProofreadDetail> prooList(@Param("type")String type);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementAmountInfoMapper.java

@@ -8,6 +8,6 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimburse
  * @author: 王强
  * @create: 2022-11-24 16:25
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementAmountInfoMapper extends BaseMapper<CwReimbursementAmountInfo>  {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoContractMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoContract;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoContractMapper extends BaseMapper<CwReimbursementDetailInfoContract> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoMapper.java

@@ -8,6 +8,6 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimburse
  * @author: 王强
  * @create: 2022-11-24 16:31
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoMapper extends BaseMapper<CwReimbursementDetailInfo> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoOtherMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoOther;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoOtherMapper extends BaseMapper<CwReimbursementDetailInfoOther> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoProcuredMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoProcured;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoProcuredMapper extends BaseMapper<CwReimbursementDetailInfoProcured> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoReportMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoReport;
 
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoReportMapper extends BaseMapper<CwReimbursementDetailInfoReport> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementInfoMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-24 16:09
  **/
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementInfoMapper extends BaseMapper<CwReimbursementInfo> {
 
     IPage<ProgramProjectListInfo> findProjectList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/mapper/ReportCancellApplyMapper.java

@@ -25,7 +25,7 @@ public interface ReportCancellApplyMapper extends BaseMapper<ReportCancellApply>
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<ReportInfoDto> getList(Page<ReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportInfoDto> queryWrapper, @Param("officeIds") String officeIds);
     @InterceptorIgnore(tenantLine = "true")
     ReportInfoDto queryById(@Param("id") String id);
@@ -36,7 +36,7 @@ public interface ReportCancellApplyMapper extends BaseMapper<ReportCancellApply>
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<ReportInfoDto> findList(Page<ReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportInfoDto> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/ReportCancellApplyArchivedMapper.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @create: 2022-11-18 17:35
  **/
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface ReportCancellApplyArchivedMapper extends BaseMapper<CwProjectReportApplyArchive> {
 
     /**
@@ -33,7 +33,7 @@ public interface ReportCancellApplyArchivedMapper extends BaseMapper<CwProjectRe
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage<ArchivedReportInfoDto> getList(Page<ArchivedReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ArchivedReportInfoDto> queryWrapper, @Param("officeIds") String officeIds);
 
     ApplyArchiveReportDTO queryById(@Param("id") String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwManageLevelTypeMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @Entity com.jeeplus.test.cw.workClientInfo.domain.CwManageLevelType
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwManageLevelTypeMapper extends BaseMapper<CwManageLevelType> {
 
     public IPage<CwManageLevelTypeDTO> findList(Page<CwManageLevelTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwManageLevelType> queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwOrganizationTypeMapper.java

@@ -17,9 +17,9 @@ import java.util.List;
  * @Entity com.jeeplus.test.cw.workClientInfo.domain.CwOrganizationType
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwOrganizationTypeMapper extends BaseMapper<CwOrganizationType> {
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     public IPage<CwOrganizationTypeDTO> findList(Page<CwOrganizationTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwOrganizationType> queryWrapper);
 
     public CwOrganizationTypeDTO queryById(@Param("id") String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -20,10 +20,9 @@ import java.util.List;
  * @Entity com.jeeplus.test.cw.workClientInfo.domain.CwWorkClientBase
  */
 @Mapper
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
-    @InterceptorIgnore(tenantLine = "true")
     public IPage<CwWorkClientBaseDTO> findList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
-    @InterceptorIgnore(tenantLine = "true")
     public CwWorkClientBaseDTO queryById(@Param("id") String id);
 
     public List<CwWorkClientTempDTO>  queryUpdateLogList (@Param(Constants.WRAPPER) QueryWrapper<CwWorkClientTemp> queryWrapper);

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/OssServiceMapper.java

@@ -24,7 +24,7 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
     @InterceptorIgnore(tenantLine = "true")
     void updateProjectRecord(String id);
 
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     List<AttachmentDTO> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")
@@ -35,7 +35,7 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
      * @param workAttachment
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachmentInfo workAttachment);
 
     /**

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/reimApprovalType/mapper/CwReimbursementTypeMapper.java

@@ -27,7 +27,7 @@ public interface CwReimbursementTypeMapper extends BaseMapper<CwReimbursementTyp
      */
     List<CwReimbursementTypeInfo> findList(@Param(Constants.WRAPPER) Wrapper<CwReimbursementTypeInfo> queryWrapper);
 
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     List<CwReimbursementTypeInfo> bxList2(@Param(Constants.WRAPPER) Wrapper<CwReimbursementTypeInfo> queryWrapper,
                                           @Param("officeId") String officeId);
 

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -81,7 +81,7 @@ public interface UserMapper extends BaseMapper <User> {
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     IPage <UserDTO> findList(Page <UserDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);