From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
index 9084f60..2ba4b04 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
@@ -331,7 +331,7 @@
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public Company createByLingyang(UserDTO user, String pwd){
+ public Company createByLingyang(UserDTO user,Date date,String remark, String pwd){
AutoLoginUserDTO param = new AutoLoginUserDTO();
param.setOrgName(user.getOrgName());
param.setName(user.getName());
@@ -341,6 +341,8 @@
param.setManager(user.getManager());
param.setUserinfo(JSONObject.toJSONString(user));
param.setOrigin(Constants.COMPANY_ORIGIN.lingyang);
+ param.setDate(date!=null ?date:new Date());
+ param.setRemark(remark);
return createByThirdParam(param,pwd);
}
public Company createByThirdParam(AutoLoginUserDTO user, String pwd){
@@ -356,13 +358,15 @@
//濡傛灉浼佷笟淇℃伅涓虹┖锛屾柊澧炰紒涓氫俊鎭�
com = new Company();
com.setDeleted(Constants.ZERO);
- com.setCreateTime(new Date());
+ com.setCreateTime(user.getDate()!=null?user.getDate():new Date());
com.setIsNew(Constants.ONE);
// com.setOrigin(Constants.THREE);
com.setCreditCode(user.getCreditCode());
com.setName(user.getOrgName());
com.setLingyangInfo(user.getUserinfo());
com.setLegalPersonPhone(user.getPhone());
+ //娴嬭瘯缇氱緤鎵嬪姩瀵煎叆锛堟爣璁帮級
+ com.setRemark(user.getRemark());
//榛樿闄愬埗浜哄憳10
if(user.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
int userNum = 10;
@@ -467,6 +471,16 @@
}
}
initRedisCache(com);
+ }else{
+ Department department = new Department();
+ department.setCompanyId(com.getId());
+ department.setDeleted(Constants.ZERO);
+ department.setType(Constants.DEPART_TYPE.com);
+ department = departmentExtMapper.selectOne(new QueryWrapper<>(department).last("limit 1"));
+ if(department == null){
+ throw new BusinessException(ResponseStatus.ERR_STATUS.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅寮傚父锛岃鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
+ com.setRootDepartment(department);
}
}else{
if(com == null){
--
Gitblit v1.9.3