fanzherong_v 3 viikkoa sitten
vanhempi
commit
bb06054605

+ 5 - 0
snowy-admin-web/src/views/biz/consumptionrecord/index.vue

@@ -171,6 +171,11 @@
 			dataIndex: 'orgName',
 			align: 'center',
 		},
+		{
+			title: '操作人',
+			dataIndex: 'createUserName',
+			align: 'center',
+		},
 		{
 			title: '说明',
 			dataIndex: 'consumptionRemark',

+ 2 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/consumptionrecord/mapper/mapping/ConsumptionRecordMapper.xml

@@ -20,7 +20,8 @@
             su.PHONE,
             cr.new_account_balance newAccountBalance,
             cr.new_voucher_balance newVoucherBalance,
-            su.USER_REFERRAL_CODE userCode
+            su.USER_REFERRAL_CODE userCode,
+            cr.create_user
         from biz_consumption_record cr
         left join SYS_USER su on cr.user_id = su.id
         left join SYS_ORG so on so.id = cr.consumption_org

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -180,7 +180,7 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         // 排除超管
         queryWrapper.lambda().ne(BizUser::getAccount, BizBuildInEnum.BUILD_IN_USER_ACCOUNT.getValue());
         //排除会员
-        queryWrapper.lambda().ne(BizUser::getUserType, 3);
+        //queryWrapper.lambda().ne(BizUser::getUserType, 3);
         // 校验数据范围
         List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
         if (ObjectUtil.isNotEmpty(loginUserDataScope)) {

+ 1 - 1
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -250,7 +250,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper.lambda().orderByAsc(SysUser::getSortCode);
         }
         //排除会员
-        queryWrapper.lambda().ne(SysUser::getUserType, 3);
+        //queryWrapper.lambda().ne(SysUser::getUserType, 3);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }