From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 27 三月 2025 16:47:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java index e34a01b..ce342e3 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java @@ -1,8 +1,8 @@ package com.doumee.service.business.impl; -import com.doumee.core.model.LoginUserInfo; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.LoginUserInfo; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.VisitReasonMapper; @@ -49,7 +49,6 @@ update.setIsdeleted(Constants.ONE); update.setId(id); visitReasonMapper.updateById(update); - } @Override @@ -100,6 +99,7 @@ public List<VisitReason> findList(VisitReason visitReason) { QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason); wrapper.eq("isdeleted",Constants.ZERO); + wrapper.orderByAsc("sortnum"); return visitReasonMapper.selectList(wrapper); } @@ -139,4 +139,8 @@ QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason); return visitReasonMapper.selectCount(wrapper); } + + + + } -- Gitblit v1.9.3