|
|
@@ -132,11 +132,13 @@ public class EmployeeInfoProvider extends GenericProvider implements IEmployeeIn
|
|
|
String userId = employeeInfoPo.getId();
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
String createTime = sdf.format(employeeInfoPo.getCreateTime());
|
|
|
- //查出用户的主部门
|
|
|
+ String updateTime = sdf.format(employeeInfoPo.getUpdateTime());
|
|
|
+ String time = StringUtil.isNotEmpty(updateTime) ? updateTime : createTime;
|
|
|
+ //查出用户的主部门
|
|
|
String sql=" SELECT MAIN_PID_ FROM IBPS_PARTY_REL WHERE SUB_PID_ = '"+userId+"' AND BIZ_ = 'mainPost' limit 1 ";
|
|
|
List<Map<String,Object>> query = (List<Map<String,Object>>)commonDao.query(sql);
|
|
|
String pid = query.get(0).get("MAIN_PID_").toString();
|
|
|
- String subject = "个人档案卡"+"#员工姓名:"+name+"编制时间:"+createTime+"#"+"\"timeLimit\":3,\"dept\":\""+pid+"\"";
|
|
|
+ String subject = "个人档案卡"+"#员工姓名:"+name+"编制时间:"+time+"#"+"\"timeLimit\":3,\"dept\":\""+pid+"\"";
|
|
|
String select = "SELECT i.ID_ as inst_id_,t.ID_ as t_id_ FROM IBPS_BPM_INST i JOIN IBPS_BPM_TASKS t on i.ID_ = t.PROC_INST_ID_ WHERE i.PROC_DEF_KEY_ in('Process_0v35zf8','Process_08xwabfNEW') AND i.CREATE_BY_ = '"+userId+"' ORDER BY i.CREATE_TIME_ DESC limit 1";
|
|
|
List<Map<String,Object>> bpm = (List<Map<String,Object>>)commonDao.query(select);
|
|
|
if(Collections.isNotEmpty(bpm) && StringUtil.isNotEmpty(bpm.get(0).get("inst_id_").toString()) && StringUtil.isNotEmpty(bpm.get(0).get("t_id_").toString())){
|