From 897c9a4944a7978c3b83ea6567560d7e3e552147 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 11:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
index 7775a0c..8b6e805 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
@@ -9,6 +9,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -36,8 +37,9 @@
Object bean = ApplicationContextProvider.getApplicationContext().getBean(beanName);
if(bean!=null){
CodeSerialAlgorithmVO algorithmVO = new CodeSerialAlgorithmVO();
- Advised advised = (Advised)bean;
- Class<?> targetClass = advised.getTargetSource().getTargetClass();
+ //Advised advised = (Advised)bean;
+ Class<?> targetClass = AopUtils.getTargetClass(bean);
+ //Class<?> targetClass = advised.getTargetSource().getTargetClass();
algorithmVO.setClassFullName(targetClass.getName());
MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class);
if(serialAlgorithm==null){
@@ -57,6 +59,7 @@
}
Query query=new Query();
IPage<CodeSerialAlgorithmVO> queryIPage =Condition.getPage(query);
- return queryIPage;
+ queryIPage.setRecords(voList);
+ return queryIPage;
}
}
--
Gitblit v1.9.3