From fb8595ac00e36ac6e7f71dd7169127b01da4c8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 16 Oct 2024 18:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A1=E8=B4=A6=E5=8F=B7=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/datacollection/DataCollectionEmployee.java | 5 +++-- src/com/engine/salary/mapper/datacollection/EmployMapper.xml | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java index 9c6fa710b..9203785c0 100644 --- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java +++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java @@ -115,13 +115,14 @@ public class DataCollectionEmployee { private String idNo; - @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "accountTypeName") + @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "string") private String accountTypeName; /** + * 账号类型 * 0/null：主账号 1：次账号 */ - @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "accountType") + @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "string") private Integer accountType; //是否是系统管理员 diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 149522857..3a2ed14af 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -89,7 +89,6 @@ left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id left join hrmjobcall job on e.jobcall=job.id where e.status not in (7) - and (e.accounttype is null or e.accounttype = 0) AND e.id IN