问题修改

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

@@ -7,14 +7,12 @@ import com.kingdee.bos.Context;
 import com.kingdee.bos.bsf.service.app.IHRMsfService;
 import com.kingdee.bos.rabbitmq.guava.Lists;
 import com.kingdee.eas.common.EASBizException;
-import com.kingdee.eas.custom.beisen.synchronouspos.handler.ExecutorCountUtil;
 import com.kingdee.eas.custom.beisen.utils.BeiSenUtils;
 import com.kingdee.eas.custom.beisen.utils.BeisenParamByPropertiesUtil;
 import com.kingdee.eas.custom.beisen.utils.Helper;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
 
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -56,12 +54,13 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 String FTableName = rs.getString("FTableName");
                 String FYear = rs.getString("FYear");
                 StringBuilder selSql = new StringBuilder();
+                selSql.append(" select * from ( ");
                 selSql.append(" select 'org' orgpos,org.fid posId,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("         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 ");
+                selSql.append("         (staff.FState+1) FState,staff.FContainSub ");
                 selSql.append(" from ");
                 selSql.append(" "+FTableName+" staff ");
                 selSql.append(" left join t_org_admin org on org.fid=staff.FAdminOrgID ");
@@ -73,12 +72,13 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 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 ");
+                selSql.append("         (staff.FState+1) FState,staff.FContainSub ");
                 selSql.append(" from ");
                 selSql.append(" "+FTableName+" staff ");
                 selSql.append(" left join t_org_admin org on org.fid=staff.FAdminOrgID ");
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" where pos.fid is not null and pos.CFOriginalId is not null ");
+                selSql.append(" ) t order by t.FContainSub desc ");
                 IRowSet rsSel = DbUtil.executeQuery(context, selSql.toString());
                 // »ñÈ¡·ÃÎÊÁîÅÆ
 

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

@@ -181,7 +181,7 @@ public class SynchronousPosOSFService implements IHRMsfService {
         sql.append(" pos.fnumber posNumber, ");
         sql.append(" pos.fname_l2 posName, ");
         sql.append(" org.fid orgId, ");
-        sql.append(" org.fid orgOriginalId, ");
+        sql.append(" org.FreserveFieldFirst orgOriginalId, ");
         sql.append(" isnull(org.fnumber,'') orgNumber, ");
         sql.append(" isnull(org.fname_l2,'') orgName, ");
         sql.append("  (case when pos.FDELETEDSTATUS=2 then 0 else 1 end) posDeletedStatus, ");