Commit be824495 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22

parents 2aeacb39 17f552a7
......@@ -894,12 +894,14 @@ public class FascUtil {
}
// 翻译字典
private String getCoverValue(String valueStr, String fieldType, String fieldValue, String fieldDefailtValue) {
if (Common.isNotNull(valueStr) && Common.isNotNull(fieldType)) {
if (Common.isNotNull(valueStr)) {
if (Common.isNotNull(fieldType)) {
if (DATA_COVER.equals(fieldType)) {
valueStr = convertByExp(fieldValue, valueStr);
} else if (DATE_FORMAT.equals(fieldType)) {
valueStr = formatStringDate(fieldValue, valueStr);
}
}
} else if (Common.isNotNull(fieldDefailtValue)) {
valueStr = fieldDefailtValue;
}
......
......@@ -178,7 +178,7 @@
h.field_type,h.field_value,h.field_default_value
FROM t_fasc_template_detail a
left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field and h.contract_type = b.contract_type
where b.delete_Flag = '0' and a.delete_flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment