Commit fe3a0cdc authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents 0dba001d e57b9581
...@@ -1184,9 +1184,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1184,9 +1184,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(tSettleDomain)) { if (Common.isNotNull(tSettleDomain)) {
tEmployeeProject.setDeptId(tSettleDomain.getId()); tEmployeeProject.setDeptId(tSettleDomain.getId());
tEmployeeProject.setDeptName(tSettleDomain.getDepartName()); tEmployeeProject.setDeptName(tSettleDomain.getDepartName());
tEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
tEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
tEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
TCustomerInfo tCustomerInfo = tCustomerInfoMapper.selectById(tSettleDomain.getCustomerId()); TCustomerInfo tCustomerInfo = tCustomerInfoMapper.selectById(tSettleDomain.getCustomerId());
if (Common.isNotNull(tCustomerInfo)) { if (Common.isNotNull(tCustomerInfo)) {
;
tEmployeeProject.setUnitId(tCustomerInfo.getId()); tEmployeeProject.setUnitId(tCustomerInfo.getId());
tEmployeeProject.setUnitNo(tCustomerInfo.getCustomerCode()); tEmployeeProject.setUnitNo(tCustomerInfo.getCustomerCode());
tEmployeeProject.setUnitName(tCustomerInfo.getCustomerName()); tEmployeeProject.setUnitName(tCustomerInfo.getCustomerName());
......
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