From 566c542d3f1eb0ad9e918bd1fa9586ab1ed7ec86 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:28:50 +0800
Subject: [PATCH] 自定义流水相关开发

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java |   10 +++++++---
 1 files changed, 7 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..ca73465 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){
@@ -47,6 +49,7 @@
                         algorithmVO.setName(serialAlgorithm.text());
                         algorithmVO.setDescription(serialAlgorithm.description());
                         algorithmVO.setId(serialAlgorithm.value());
+						algorithmVO.setSerialType(serialAlgorithm.serialType());
                         if(StringUtils.isBlank(algorithmVO.getId())){
                             algorithmVO.setId(beanName);
                         }
@@ -57,6 +60,7 @@
         }
 		Query query=new Query();
 		IPage<CodeSerialAlgorithmVO> queryIPage =Condition.getPage(query);
-        return queryIPage;
+		queryIPage.setRecords(voList);
+		return queryIPage;
     }
 }

--
Gitblit v1.9.3