From bd6424dd603857545eef83ad3c85579f6230034d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 六月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java | 13 +++++++++----
1 files changed, 9 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 e21b168..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;
@@ -47,8 +47,8 @@
update.setEditor(userInfo.getId());
update.setEditDate(new Date());
update.setIsdeleted(Constants.ONE);
+ update.setId(id);
visitReasonMapper.updateById(update);
-
}
@Override
@@ -99,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);
}
@@ -138,4 +139,8 @@
QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason);
return visitReasonMapper.selectCount(wrapper);
}
+
+
+
+
}
--
Gitblit v1.9.3