Merge branch 'feature-lihb-20250610' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/StandardInfo.java

@@ -1,5 +1,6 @@
 package org.springblade.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -91,4 +92,10 @@ public class StandardInfo {
      */
     @ApiModelProperty(value = "修改人", hidden = true)
     private Long updateUser;
+
+    /**
+     * 符号名称
+     */
+    @TableField(exist = false)
+    private String symbolName;
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.xml

@@ -72,7 +72,7 @@
     </select>
     <select id="findByParentId" resultType="org.springblade.business.entity.StandardInfo">
         select
-            <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>,concat(symbol,name) symbolName
         FROM
             u_standard_info
         WHERE

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoServiceImpl.java

@@ -178,7 +178,11 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
                     uStandardInfoJoin.setCreateUser(user.getUserId());
                     saveData.add(uStandardInfoJoin);
                 }
+                //先删除之前的关联关系
+                standardInfoJoinService.remove(Wrappers.<StandardInfoJoin>lambdaQuery()
+                        .eq(StandardInfoJoin::getStandardInfoLeftId,leftId));
             }
+            //新增
             return standardInfoJoinService.saveBatch(saveData);
         } catch (Exception e) {
             e.printStackTrace();
@@ -202,6 +206,9 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
                     f.setCreateUser(user.getUserId());
                 });
                 saveData.addAll(rightIds);
+                //删除之前的关联关系
+                standardInfoPrivateJoinService.remove(Wrappers.<StandardInfoPrivateJoin>lambdaQuery()
+                        .eq(StandardInfoPrivateJoin::getStandardInfoId,leftId));
             }
             return standardInfoPrivateJoinService.saveBatch(saveData);
         } catch (Exception e) {