Ver código fonte

1)单位保存逻辑完善,增加判断当前用户关联单位是否存在。

tomatozq 5 anos atrás
pai
commit
525aa37763

+ 5 - 2
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyController.java

@@ -75,6 +75,7 @@ public class CompanyController {
         try {
             //todo
             AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+            CompanyUser companyUser = companyUserService.findByUserName(principal.getName());
 
             Company company = null;
 
@@ -82,6 +83,10 @@ public class CompanyController {
                 company = companyService.get(companyInfoDTO.getId());
             }
 
+            if(company==null && companyUser!=null && StringUtils.isNotEmpty(companyUser.getCompanyId())){
+                company = companyService.get(companyUser.getCompanyId());
+            }
+
             //身份证、营业执照、企业公章(附件)如果没上传时,会传null值
             if ("null".equals(companyInfoDTO.getLegalCardFile())){
                 companyInfoDTO.setLegalCardFile("");
@@ -118,8 +123,6 @@ public class CompanyController {
                 messageResult.setData(company.getId());
             }
 
-            CompanyUser companyUser = companyUserService.findByUserName(principal.getName());
-
             if(companyUser==null){
                 //可能直接通过cas统一登录页面登录,所以没有记录用户信息
                 companyUser = new CompanyUser();