Commit 382adbc8 authored by chenzhao's avatar chenzhao

修改代码

parent 140ab4f5
...@@ -137,7 +137,7 @@ public class ControllerAop { ...@@ -137,7 +137,7 @@ public class ControllerAop {
DepartmentModel departmentM = new DepartmentModel(); DepartmentModel departmentM = new DepartmentModel();
CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null; CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
Bean.copyExistPropertis(companyM, company); Bean.copyExistPropertis(companyM, company);
if (user.getCompanyDepartments() != null){ if (!ValidationUtil.isEmpty(user.getCompanyDepartments())){
mapDepartments = user.getCompanyDepartments(); mapDepartments = user.getCompanyDepartments();
departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null; departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
} }
......
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