优化前端实体处理逻辑 --- fix7

APP/src/service/%DE_PKGPATH%/%APP_DELOGIC%-logic-base.ts.ftl

@@ -41,25 +41,25 @@ import { Verify } from '@/utils/verify/verify';
     let tempDstParam${logicparam_index}Data:any = this.paramsMap.get('${dstParam.getCodeName()}').data?this.paramsMap.get('${dstParam.getCodeName()}').data:{};
 <#if logicparam.getSrcValueType() =="SRCDLPARAM">
     let tempSrcParam${logicparam_index}Data:any = this.paramsMap.get('${srcParam.getCodeName()}').data?this.paramsMap.get('${srcParam.getCodeName()}').data:{};
-    <#if dstFieldParam.ends_with("id")>
+    <#if dstFieldParam == dstParam.getParamPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case>
     Object.assign(tempDstParam${logicparam_index}Context,{${dstParam.getParamPSAppDataEntity().getCodeName()?lower_case}:tempSrcParam${logicparam_index}Data['${srcFieldParam}']});
     </#if>
     Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:tempSrcParam${logicparam_index}Data['${srcFieldParam}']});
 <#-- 应用上下文 -->
 <#elseif logicparam.getSrcValueType() =="APPDATA">
-    <#if dstFieldParam.ends_with("id")>
+    <#if dstFieldParam == dstParam.getParamPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case>
     Object.assign(tempDstParam${logicparam_index}Context,{${dstParam.getParamPSAppDataEntity().getCodeName()?lower_case}:context['${srcFieldParam}']});
     </#if>
     Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:context['${srcFieldParam}']});
 <#-- 数据上下文 -->
 <#elseif logicparam.getSrcValueType() =="DATACONTEXT">
-    <#if dstFieldParam.ends_with("id")>
+    <#if dstFieldParam == dstParam.getParamPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case>
     Object.assign(tempDstParam${logicparam_index}Context,{${dstParam.getParamPSAppDataEntity().getCodeName()?lower_case}:params['${srcFieldParam}']});
     </#if>
     Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:params['${srcFieldParam}']});
 <#-- 直接值 -->
 <#elseif logicparam.getSrcValueType() =="SRCVALUE">
-    <#if dstFieldParam.ends_with("id")>
+    <#if dstFieldParam == dstParam.getParamPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case>
     Object.assign(tempDstParam${logicparam_index}Context,{${dstParam.getParamPSAppDataEntity().getCodeName()?lower_case}:${logicparam.getSrcValue()}});
     </#if>
     Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:${logicparam.getSrcValue()}});