diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCardController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCardController.java index e676308..d15d89d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCardController.java @@ -36,7 +36,6 @@ public class MemberCardController extends BaseController { @PreAuthorize("@ss.hasPermi('member:card:list')") @GetMapping("/list") public AjaxResult list(MemberCard memberCard) { - List list = memberCardService.list(); return success(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java index 32313f7..21cbeb7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.member.mapper.MemberBusiCardMapper; import com.ruoyi.member.query.MemberBusiCardQuery; import com.ruoyi.member.service.IMemberBusiCardService; import com.ruoyi.member.vo.MemberBusiCardVO; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +43,8 @@ public class MemberBusiCardServiceImpl extends ServiceImpl list = categoryService.selectByCode(memberBusiCard.getPlatformCode()); memberBusiCard.setPlatformName(list.get(0).getTitle()); diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml index 0ba9888..5168c39 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml @@ -43,6 +43,7 @@ and approval_status != 0 and approval_status = #{entity.approvalStatus} + order by create_time asc