diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java
index bb87dbd3..e109c95e 100644
--- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java
+++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java
@@ -44,6 +44,8 @@ public interface JclOrgMapper {
int insertComToMap();
- int deleteJobNull();
+ int deleteJobNull(@Param("currentDate") String currentDate);
+
+ JclOrgMap getResInfo(@Param("level") String level, @Param("grade") String grade, @Param("id") String id);
}
diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
index 05e96d6d..30e94239 100644
--- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
+++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
@@ -320,7 +320,16 @@
0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany
- delete from jcl_org_map where ftype=3 and fonjob=0
+ delete from jcl_org_map where ftype =3 and id not in (select FPARENTID from jcl_org_map where ftype=4 ) and fdateend > #{currentDate}
-
+
\ No newline at end of file
diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
index 3cba9971..1eadb1af 100644
--- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
@@ -377,8 +377,21 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
return result;
}
//处理多个部门负责人
- private Map getBmfzrInfo (String bmfzr){
-
+ private JclOrgMap getBmfzrInfo (String bmfzr){
+// if (StringUtils.isNotBlank(bmfzr)) {
+// try {
+// String[] split = fLeaderSt.split(",");
+// for (String s : split) {
+// long parseLong = Long.parseLong(s);
+// GradePO gradeByID = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(parseLong);
+// if (null != gradeByID) {
+// jobGradeName.append(gradeByID.getGradeName());
+// }
+// }
+// } catch (NumberFormatException exception) {
+// jobGradeName = new StringBuilder(fLeaderSt);
+// }
+// }
return null;
}
@@ -533,16 +546,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
getJclOrgMapMapper().insertSubComToMap();
//同步集团信息
getJclOrgMapMapper().insertComToMap();
-
+ //清除部门合并、转移造成的脏数据
+ getJclOrgMapMapper().deleteJobNull(currentDate);
//刷新在岗数、编制数(从岗位向上刷,岗位不需处理)
List jclOrgMaps = getJclOrgMapMapper().getJclOrgMapByType("3",date);
for (JclOrgMap jclOrgMap : jclOrgMaps){
int id = jclOrgMap.getId();
countJobAndPlans("3",id,currentDate);
}
-
- //清除部门合并、转移造成的脏数据
- getJclOrgMapMapper().deleteJobNull();
return "同步成功";
}
/**