Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementDispatchServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -165,9 +166,26 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                         String minName = ptlAreaLicenseService.convertAreaNumber2License(areaLicenseMap, attrlink.getMin());
                         attrlink.setMinName(minName);
                     }else{
-                        String minName = dictLabalId2Name.getOrDefault(attrlink.getMin(),attrlink.getMin());
+                        String minName = dictLabalId2Name.get(attrlink.getMin());
+                        if(StrUtil.isNotEmpty(minName)){
+                            attrlink.setMinName(minName);
+                        }else{
+                            List<String> names = new ArrayList<>();
+                            minName = attrlink.getMin();
+                            if(StrUtil.isNotEmpty(attrlink.getMin())){
+                                String[] split = attrlink.getMin().split(",");
+                                if(split.length >=2){
+                                    for (String s : split) {
+                                        names.add(dictLabalId2Name.get(s));
+                                    }
+                                    minName = String.join(",", names);
+                                }
+                            }
+                            attrlink.setMinName(minName);
+                        }
+
                         String maxName = dictLabalId2Name.getOrDefault(attrlink.getMax(),attrlink.getMax());
-                        attrlink.setMinName(minName);
+
                         attrlink.setMaxName(maxName);
                     }
                     PtlAgreementUndwrtRulesAttr undwrtRuleAttrByAttrCode = ptlAgreementUndwrtRulesAttrService.getUndwrtRuleAttrByAttrCode(attrlink.getAttrCode());