次账号规则

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;
 
     //是否是系统管理员

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)
         <if test="collection != null and collection.size()>0">
             AND e.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">