Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -131,10 +132,15 @@ public class ControllerAop {
         CompanyBo company = new CompanyBo();
         DepartmentBo department = new DepartmentBo();
         RoleBo role = new RoleBo();
+        //平台更新 人员部门可能为NULL 导致redis缓存不到人员信息 
+        Map<Long, List<DepartmentModel>> mapDepartments = new HashMap<>();
+        DepartmentModel departmentM = new DepartmentModel();
         CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
         Bean.copyExistPropertis(companyM, company);
-        Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
-        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
+        if (user.getCompanyDepartments() != null){
+            mapDepartments   = user.getCompanyDepartments();
+            departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
+        }
         Bean.copyExistPropertis(departmentM, department);
         Map<Long, List<RoleModel>> roles = user.getOrgRoles();
         Long sequenceNbr;