|
@@ -1178,15 +1178,15 @@ public class WorkContractInfoController extends BaseController {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
//判断当前登录人所属部门是否是苏州分公司
|
|
//判断当前登录人所属部门是否是苏州分公司
|
|
- WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
- Office info = officeDao.getByName("苏州分公司");
|
|
|
|
- List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
- for (Office office1 : officeList) {
|
|
|
|
- if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
- //将该数据保存到ccpm cloud项目中
|
|
|
|
- sendContractInfoDataToCloud(contractInfo);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+// WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
+// Office info = officeDao.getByName("苏州分公司");
|
|
|
|
+// List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
+// for (Office office1 : officeList) {
|
|
|
|
+// if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
+// //将该数据保存到ccpm cloud项目中
|
|
|
|
+// sendContractInfoDataToCloud(contractInfo);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
|
|
return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
|
|
return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
|
|
}
|
|
}
|
|
@@ -1876,15 +1876,15 @@ public class WorkContractInfoController extends BaseController {
|
|
addMessage(redirectAttributes, "审批失败");
|
|
addMessage(redirectAttributes, "审批失败");
|
|
}
|
|
}
|
|
//判断合同创建人所属部门是否是苏州分公司
|
|
//判断合同创建人所属部门是否是苏州分公司
|
|
- WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
- Office info = officeDao.getByName("苏州分公司");
|
|
|
|
- List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
- for (Office office1 : officeList) {
|
|
|
|
- if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
- //将该数据保存到ccpm cloud项目中
|
|
|
|
- sendContractInfoDataToCloud(contractInfo);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+// WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
+// Office info = officeDao.getByName("苏州分公司");
|
|
|
|
+// List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
+// for (Office office1 : officeList) {
|
|
|
|
+// if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
+// //将该数据保存到ccpm cloud项目中
|
|
|
|
+// sendContractInfoDataToCloud(contractInfo);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
|
|
if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
|
|
return "redirect:" + Global.getAdminPath() + "/home/?repage";
|
|
return "redirect:" + Global.getAdminPath() + "/home/?repage";
|
|
}else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
|
|
}else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
|
|
@@ -1941,15 +1941,15 @@ public class WorkContractInfoController extends BaseController {
|
|
addMessage(redirectAttributes, "审批失败");
|
|
addMessage(redirectAttributes, "审批失败");
|
|
}
|
|
}
|
|
//判断合同创建人所属部门是否是苏州分公司
|
|
//判断合同创建人所属部门是否是苏州分公司
|
|
- WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
- Office info = officeDao.getByName("苏州分公司");
|
|
|
|
- List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
- for (Office office1 : officeList) {
|
|
|
|
- if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
- //将该数据保存到ccpm cloud项目中
|
|
|
|
- sendContractInfoDataToCloud(contractInfo);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+// WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
|
|
|
|
+// Office info = officeDao.getByName("苏州分公司");
|
|
|
|
+// List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
|
|
|
|
+// for (Office office1 : officeList) {
|
|
|
|
+// if (office1.getId().equals(contractInfo.getChargeCompany())){
|
|
|
|
+// //将该数据保存到ccpm cloud项目中
|
|
|
|
+// sendContractInfoDataToCloud(contractInfo);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
|
|
if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
|
|
return "redirect:" + Global.getAdminPath() + "/home/?repage";
|
|
return "redirect:" + Global.getAdminPath() + "/home/?repage";
|
|
}else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
|
|
}else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
|