更新组织外置id为编码

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SyncStaffManageOSFService.java

@@ -75,11 +75,13 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 StringBuilder selSql = new StringBuilder();
                 selSql.append(" select * from ( ");
                 selSql.append(" select 'org' orgpos,org.fid posId,org.Fnumber orgOriginalId,org.FParentID,org.fname_l2 orgPosName,org.FDisplayName_L2 staffName, ");
-                selSql.append("         org.fid CFOriginalId,(case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
+                selSql.append("         org.Fnumber CFOriginalId, ");
+                //selSql.append("         (case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
+                selSql.append("         staff.FControlWay FControlWay, ");
                 selSql.append("         staff.FPersonCount,staff.FStaffYear,staff.FYearActualStart, ");
                 selSql.append("         staff.FOnWayAddCount,staff.FOnWaySubCount, ");
                 selSql.append("         (staff.FStaffYear-staff.FOnWayAddCount+staff.FOnWaySubCount-staff.FPersonCount) FStaffYearUsable, ");
-                selSql.append("         (staff.FState+1) FState,staff.FContainSub, ");
+                selSql.append("         (staff.FState) FState,staff.FContainSub, ");
                 selSql.append(" 1 orgPosStatus ");
                 selSql.append(" from ");
                 selSql.append(" "+FTableName+" staff ");
@@ -88,11 +90,12 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 selSql.append(" where pos.fid is null and org.FReserveFieldFirst is not null ");
                 selSql.append(" UNION all ");
                 selSql.append(" select 'pos' orgpos,pos.fid posId,org.FreserveFieldFirst orgOriginalId,pos.FParentID,pos.fname_l2 orgPosName,org.FDisplayName_L2 staffName,pos.CFOriginalId, ");
-                selSql.append(" (case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
+                //selSql.append(" (case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
+                selSql.append("         staff.FControlWay FControlWay, ");
                 selSql.append("         staff.FPersonCount,staff.FStaffYear,staff.FYearActualStart, ");
                 selSql.append("         staff.FOnWayAddCount,staff.FOnWaySubCount, ");
                 selSql.append("         (staff.FStaffYear-staff.FOnWayAddCount+staff.FOnWaySubCount-staff.FPersonCount) FStaffYearUsable, ");
-                selSql.append("         (staff.FState+1) FState,staff.FContainSub, ");
+                selSql.append("         (staff.FState) FState,staff.FContainSub, ");
                 selSql.append("  (case when pos.FDELETEDSTATUS=2 then 0 else 1 end) orgPosStatus ");
                 selSql.append(" from ");
                 selSql.append(" "+FTableName+" staff ");