Commit 17ce4982 authored by 廖旭伟's avatar 廖旭伟

事项申请列表查询条件增加工作人员用户id

parent c124018d
...@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -46,7 +47,6 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap ...@@ -46,7 +47,6 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap
if (ObjectUtils.isEmpty(tempUser)) { if (ObjectUtils.isEmpty(tempUser)) {
//新增 //新增
ApproverEntity approverEntity = new ApproverEntity(); ApproverEntity approverEntity = new ApproverEntity();
approverEntity.initAttrValue();
approverEntity.setFullName(phpPdu.getUser_name()); approverEntity.setFullName(phpPdu.getUser_name());
approverEntity.setLoginName(phpPdu.getAccount()); approverEntity.setLoginName(phpPdu.getAccount());
try { try {
...@@ -56,13 +56,13 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap ...@@ -56,13 +56,13 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap
} }
approverEntity.setPhoneNumber(phpPdu.getMobile()); approverEntity.setPhoneNumber(phpPdu.getMobile());
approverEntity.setSiteId(1l); approverEntity.setSiteId(1l);
approverEntity.setCreateTime(new Date());
dao.insert(approverEntity); dao.insert(approverEntity);
} else { } else {
//更新 //更新
ApproverEntity approverEntity = new ApproverEntity(); ApproverEntity approverEntity = new ApproverEntity();
approverEntity.setId(tempUser.getId()); approverEntity.setId(tempUser.getId());
approverEntity.initAttrValue();
approverEntity.setFullName(phpPdu.getUser_name()); approverEntity.setFullName(phpPdu.getUser_name());
approverEntity.setLoginName(phpPdu.getAccount()); approverEntity.setLoginName(phpPdu.getAccount());
try { try {
...@@ -71,6 +71,7 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap ...@@ -71,6 +71,7 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap
throw new AppException("密码转换异常!", e); throw new AppException("密码转换异常!", e);
} }
approverEntity.setPhoneNumber(phpPdu.getMobile()); approverEntity.setPhoneNumber(phpPdu.getMobile());
approverEntity.setUpdateTime(new Date());
dao.update(approverEntity); dao.update(approverEntity);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment