diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
index 5f10824..136a235 100644
--- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
+++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
@@ -45,14 +45,18 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic
                 //离职
                 sql = "select zhgzr,lzqbm from uf_jcl_lzxxjl where glyg=? ";
                 List<Map<String, Object>> resignList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString()));
-
-
+                if (resignList.size() > 0){
+                    userMap.put("zhgzr",resignList.get(0).get("zhgzr"));
+                }
+                ssbm = CommonUtils.null2String(resignList.get(0).get("lzqbm"));
             }else if (ygzt.equals("6")){
                 //退休
                 sql = "select zhgzr,txqbm from uf_jcl_txxxjl where glyg=? ";
                 List<Map<String, Object>> retireList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString()));
-
-
+                if (retireList.size() > 0){
+                    userMap.put("zhgzr",retireList.get(0).get("zhgzr"));
+                }
+                ssbm = CommonUtils.null2String(retireList.get(0).get("txqbm"));
             }
             sql = "select id,name from department where id=?";
             List<Map<String, Object>> departmentList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(ssbm));