|
@@ -56,6 +56,7 @@ import com.fjhx.socket.core.PushTypeEnum;
|
|
|
import com.fjhx.socket.core.WebSocketPush;
|
|
|
import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
|
|
|
import com.fjhx.tenant.service.dict.DictTenantDataService;
|
|
|
+import com.fjhx.tenant.utils.DeptUstil;
|
|
|
import com.fjhx.tenant.utils.DictUtils;
|
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
@@ -379,10 +380,10 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
|
|
|
}
|
|
|
|
|
|
//获取归属公司信息
|
|
|
- SysDept sysDept = sysDeptService.getById(result.getCompanyId());
|
|
|
- if (ObjectUtil.isNotEmpty(sysDept)) {
|
|
|
- result.setCompanyName(sysDept.getDeptName());
|
|
|
- }
|
|
|
+ Map<Long, String> deptNameMap = DeptUstil.getDeptNameMap();
|
|
|
+ result.setCompanyName(deptNameMap.get(result.getCompanyId()));
|
|
|
+ result.setOfCompanyName(deptNameMap.get(result.getOfCompanyId()));
|
|
|
+ result.setOfDeptName(deptNameMap.get(result.getOfDeptId()));
|
|
|
|
|
|
return setDetailInfo(Arrays.asList(result)).get(0);
|
|
|
}
|