|
@@ -36,7 +36,6 @@ import com.fjhx.sale.service.contract.ContractProductBomService;
|
|
|
import com.fjhx.sale.service.contract.ContractProductService;
|
|
|
import com.fjhx.sale.service.contract.ContractProjectService;
|
|
|
import com.fjhx.sale.service.contract.ContractService;
|
|
|
-import com.fjhx.tenant.utils.DeptUstil;
|
|
|
import com.ruoyi.common.annotation.LogicIgnore;
|
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
@@ -151,11 +150,10 @@ public class ContractFlow extends FlowDelegate {
|
|
|
}
|
|
|
|
|
|
public Long start(ContractDto contract) {
|
|
|
- //赋值归属部门,归属公司信息
|
|
|
- Long deptId = contract.getDeptId();
|
|
|
- Assert.notEmpty(deptId, "归属部门id不能为空!");
|
|
|
- Long companyId = DeptUstil.getCompanyIdByDeptId(deptId);
|
|
|
- contract.setCompanyId(companyId);
|
|
|
+ //生产公司信息校验
|
|
|
+ Assert.notEmpty(contract.getCompanyId(), "归属公司给id不能为空!");
|
|
|
+ //销售部门id
|
|
|
+ contract.setDeptId(SecurityUtils.getDeptId());
|
|
|
|
|
|
// 赋值城市省份信息
|
|
|
CustomizeAreaUtil.setAreaId(contract);
|