Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/ConsumptionBo.java

@@ -119,6 +119,11 @@ public class ConsumptionBo extends BaseEntity {
      * 交易类型
      */
     private CreditTypeEnum creditType;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
     //endregion
 
     //region 错扣补款属性

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfConsumeDetailOriginalBo.java

@@ -166,5 +166,9 @@ public class XfConsumeDetailOriginalBo extends BaseEntity {
      */
     private Long operatorId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/mapper/PtUserAccountMapper.java

@@ -31,11 +31,11 @@ public interface PtUserAccountMapper extends BaseMapperPlus<PtUserAccount, PtUse
 
     Page<PtUserAccount4SelectVo> customPageList(Page<PtUserAccount> page, @Param("bo") PtUserAccountBo bo);
 
-    @Override
-    @DataPermission({
-        @DataColumn(key = "deptName", value = "dept_id"),
-    })
-    List<PtUserAccount> selectList(@Param(Constants.WRAPPER) Wrapper<PtUserAccount> queryWrapper);
+    //@Override
+    //@DataPermission({
+    //    @DataColumn(key = "deptName", value = "dept_id"),
+    //})
+    //List<PtUserAccount> selectList(@Param(Constants.WRAPPER) Wrapper<PtUserAccount> queryWrapper);
 
     default Page<PtUserAccountVo>customSelectVoPage(Page<PtUserAccount> page, Wrapper<PtUserAccount> wrapper){
         // 根据条件分页查询实体对象列表

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -438,9 +438,11 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
      */
     @Override
     public PtUserAccountVo queryByNameAndNumb(String realName, String userNumb) {
-        PtUserAccountVo vo = baseMapper.selectVoOne(Wrappers.<PtUserAccount>lambdaQuery()
+        LambdaQueryWrapper<PtUserAccount> query = new LambdaQueryWrapper<PtUserAccount>()
             .eq(PtUserAccount::getRealName,realName)
-            .eq(PtUserAccount::getUserNumb,userNumb));
+            .eq(PtUserAccount::getUserNumb,userNumb);
+
+        PtUserAccountVo vo = baseMapper.selectVoOne(query);
         if(vo!=null) {
             String deptName = remoteDeptService.selectDeptNameByIds(vo.getDeptId().toString());
             vo.setDeptName(deptName);