From 84ee37e1f485a1d3136535f9ef1c43058d9308ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 11:39:42 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 8b6e805..5a78596 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
@@ -40,7 +40,8 @@
                     //Advised advised = (Advised)bean;
 					Class<?> targetClass = AopUtils.getTargetClass(bean);
 					//Class<?> targetClass = advised.getTargetSource().getTargetClass();
-                    algorithmVO.setClassFullName(targetClass.getName());
+                  //  algorithmVO.setClassFullName(targetClass.getName());
+					algorithmVO.setClassFullName(beanName);
                     MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class);
                     if(serialAlgorithm==null){
                         serialAlgorithm = targetClass.getAnnotation(MdmSerialAlgorithm.class);
@@ -49,6 +50,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);
                         }

--
Gitblit v1.9.3