From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/SetPersonalTargetcsv.page | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/SetPersonalTargetcsv.page b/force-app/main/default/pages/SetPersonalTargetcsv.page
index 70c062a..3a1bad0 100644
--- a/force-app/main/default/pages/SetPersonalTargetcsv.page
+++ b/force-app/main/default/pages/SetPersonalTargetcsv.page
@@ -1,5 +1,5 @@
-<apex:page Controller="SetPersonalTargetController" cache="true" contentType="text/csv;charset=GB2312;#SetPersonalTarget.csv" language="zh-CN">鏈儴,鐪�,瑙掕壊,鎷呭綋,鑱屼綅,璐熻矗浜у搧鍒嗙被锛堜富锛�,璐熻矗浜у搧鍒嗙被锛堝吋锛�<apex:repeat value="{!opportunity_category}" var="oc">,{!oc}</apex:repeat>
+<apex:page Controller="SetPersonalTargetController" cache="true" contentType="text/csv;charset=GB2312;#SetPersonalTarget.csv" language="zh-CN" lightningStylesheets="true">鏈儴,鐪�,瑙掕壊,鎷呭綋,鑱屼綅,璐熻矗浜у搧鍒嗙被锛堜富锛�,璐熻矗浜у搧鍒嗙被锛堝吋锛�<apex:repeat value="{!opportunity_category}" var="oc">,{!oc}</apex:repeat>
<apex:repeat value="{!dataBeans}" var="dbs">
-"{!dbs.user.Salesdepartment__c}","{!dbs.user.Province__c}","{!dbs.user.UserRole.Name}","{!dbs.user.Alias}","{!dbs.user.Post__c}","{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}","{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}",<apex:repeat value="{!dbs.amount}" var="amount" rendered="{!IF(dbs.amount.size>=0,true,false)}">"{!amount.Amount}",</apex:repeat><apex:repeat value="{!dbs.amount}" var="amount" rendered="{!IF(dbs.amount.size<0,true,false)}">" ",</apex:repeat>
+"{!dbs.user.Salesdepartment__c}","{!dbs.user.Province__c}","{!dbs.user.UserRole.Name}","{!dbs.user.Alias}","{!dbs.user.HR_Post__c}","{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}","{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}",<apex:repeat value="{!dbs.amount}" var="amount" rendered="{!IF(dbs.amount.size>=0,true,false)}">"{!amount.Amount}",</apex:repeat><apex:repeat value="{!dbs.amount}" var="amount" rendered="{!IF(dbs.amount.size<0,true,false)}">" ",</apex:repeat>
</apex:repeat>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1