update

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserTenantAlbumRecordController.java

@@ -66,7 +66,7 @@ public class UserTenantAlbumRecordController {
     //@PreAuthorize("@auditsvc.hasPermissions('userTenantAlbumRecord/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumWrapper.TenantAlbum>> page(@RequestBody UserTenantAlbumRecordWrapper.UserTenantAlbumRecordQuery query) {
-    	query.setClientEnum(ClientEnum.STUDENT);
+    	query.setClientType(ClientEnum.STUDENT);
         IPage<TenantAlbumWrapper.TenantAlbum> pages = userTenantAlbumRecordService.selectPage(QueryInfo.getPage(query), query);
 
         return HttpResponseResult.succeed(PageUtil.pageInfo(pages));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserTenantAlbumRecordServiceImpl.java

@@ -138,7 +138,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
 
         //查询生效的机构专辑id
         if (id != null) {
-            List<Long> tenantAlbumIds = baseMapper.selectTenantIds(id, query.getClientEnum());
+            List<Long> tenantAlbumIds = baseMapper.selectTenantIds(id, query.getClientType());
             if (CollectionUtils.isEmpty(tenantAlbumIds)) {
                 return null;
             }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/UserTenantAlbumRecordWrapper.java

@@ -71,7 +71,7 @@ public class UserTenantAlbumRecordWrapper {
         private Date deductionStartTime;
         
         @ApiModelProperty("客户端")
-        private ClientEnum clientEnum;
+        private ClientEnum clientType;
 
 
         @ApiModelProperty("扣减结束时间")

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserTenantAlbumRecordMapper.xml

@@ -201,6 +201,9 @@
             <if test="param.userId != null">
                 AND t.user_id_ = #{param.userId}
             </if>
+            <if test="param.clientType != null">
+                AND t.client_type_ = #{param.clientType}
+            </if>
             <if test="param.startTime != null">
                 AND t.create_time_ >= #{param.startTime}
             </if>