账户管理查询条件

tianhu-system/src/main/java/com/tianhu/system/controller/PayAccInfController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.keao.tianhu.starter.mybatis.plus.controller.BaseController;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.keao.tianhu.core.exception.base.BusinessException;
+import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -66,11 +67,15 @@ public class PayAccInfController extends BaseController {
         //获取当前操作人员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
+        String companyId = use.getCompanyId();
         LambdaQueryWrapper<PayAccInf> payAccInf = new LambdaQueryWrapper();
         if (CommonUtil.isNotEmpty(paiAccno)){
             payAccInf.like(PayAccInf::getPaiAccno,paiAccno);
         }
-        payAccInf.eq(PayAccInf::getPaiCstno,use.getCompanyId());
+        if (!SalaryConstants.OPEX.equals(companyId)) {
+            payAccInf.eq(PayAccInf::getPaiCstno,companyId);
+        }
+        payAccInf.in(PayAccInf::getPaiAcctype,"00","01","06");
         payAccInf.eq(PayAccInf::getPaiStatus,"2");
         IPage<PayAccInf> sccInf = payAccInfService.findPayAccInfs(request, payAccInf);
         return R.ok(sccInf);