会计发票查询-根据权限判断的代码回退

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

@@ -22,8 +22,7 @@ import java.util.List;
 //@InterceptorIgnore(tenantLine = "true")
 public interface CwFinanceInvoiceMapper extends BaseMapper<CwFinanceInvoice> {
 
-    public IPage<CwFinanceInvoiceDTO> findList(Page<CwFinanceInvoiceDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwFinanceInvoice> queryWrapper,    @Param("dataRuleFlag") boolean dataRuleFlag
-    );
+    public IPage<CwFinanceInvoiceDTO> findList(Page<CwFinanceInvoiceDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwFinanceInvoice> queryWrapper);
 
     /**
      * 下载导出

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

@@ -293,9 +293,7 @@
     </select>
     <select id="findList" resultMap="BaseExportResultMap">
         select
-        <if test="dataRuleFlag == true">
             DISTINCT
-        </if>
             a.id as 'baseId',
         <include refid="Base_Column_List"></include>,
         su.name as operator,
@@ -329,9 +327,7 @@
         left join cw_finance_invoice_detail cfid on cfid.invoice_id = fi.id and cfid.del_flag = '0'
         left join sys_user su on fi.create_by_id = su.id and su.del_flag = '0'
         left join sys_user su1 on fi.reconciliation_people = su1.id and su1.del_flag = '0'
-        <if test="dataRuleFlag == true">
-            left join sys_user_manage_office sumo on sumo.office_id = su.office_id
-        </if>
+        left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
         LEFT JOIN act_ru_task d ON fi.proc_ins_id = d.PROC_INST_ID_
         LEFT JOIN cw_project_records pr on a.program_id=pr.id

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -361,14 +361,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         IPage<CwFinanceInvoiceDTO> list = null;
         //获取当前登录人角色是否是苏州报告签字盖章代办
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
-        //根据数据权限id查询当前用户是否拥有该权限
-        boolean existsUserDataRuleFlag = SpringUtil.getBean(IRoleApi.class).existsUserDataRule(userDTO, "1680932946723803133");
         if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
             for (RoleDTO roleDTO : userDTO.getRoleDTOList()) {
                 RoleDTO dtoById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
                 if ("szbgqzgzdb".equals(dtoById.getEnName())) {
                     queryWrapper.orderByDesc("fi.billing_date");
-                    list = cwFinanceInvoiceMapper.findList(page, queryWrapper,existsUserDataRuleFlag);
+                    list = cwFinanceInvoiceMapper.findList(page, queryWrapper);
                     break;
                 }
             }
@@ -390,7 +388,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                     }
                 });
             } else {
-                list = cwFinanceInvoiceMapper.findList(page, queryWrapper,existsUserDataRuleFlag);
+                list = cwFinanceInvoiceMapper.findList(page, queryWrapper);
             }
         }
         for (CwFinanceInvoiceDTO record : list.getRecords()) {
@@ -596,9 +594,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 }
             });
         } else {
-            UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
-            boolean existsUserDataRuleFlag = SpringUtil.getBean(IRoleApi.class).existsUserDataRule(userDTO, "1680932946723803133");
-            list = cwFinanceInvoiceMapper.findList(page, queryWrapper,existsUserDataRuleFlag);
+            list = cwFinanceInvoiceMapper.findList(page, queryWrapper);
         }
 
         return list;