Merge branch 'fuzq-apifix-dev-210308' into 'develop'

feature: dev支持dids等入

See merge request dcuc/auth-back!77

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -3,17 +3,18 @@ package com.dragoninfo.dcuc.authweb.restcontroller.login;
 
 import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.authweb.config.DcucAuthWebConfig;
-import com.dragoninfo.dcuc.org.entity.OrgInfo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
 import com.dragoninfo.dcuc.user.admin.facade.IManageInfoFacade;
 import com.dragoninfo.dcuc.user.admin.facade.IMenuMtAuthFacade;
 import com.dragoninfo.dcuc.user.user.entity.UserInfo;
 import com.dragoninfo.dcuc.user.user.enumresources.UserTypeEnum;
+import com.dragoninfo.dcuc.user.user.facade.IUserFacade;
 import com.dragoninfo.dcuc.user.user.facade.IUserInfoFacade;
 import com.dragonsoft.duceap.base.entity.security.SecurityRight;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
+import com.dragonsoft.duceap.web.SecurityProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,10 @@ public class DcucLoginController {
     private IOrgInfoFacade iOrgInfoFacade;
     @Autowired
     private DcucAuthWebConfig dcucAuthWebConfig;
+    @Autowired
+    private IUserFacade userFacade;
+    @Autowired
+    private SecurityProperties securityProperties;
 
     public static final Logger logger = LoggerFactory.getLogger(DcucLoginController.class);
 
@@ -48,10 +53,18 @@ public class DcucLoginController {
 
     @GetMapping(value = "/info")
     public SecurityUser info() {
-        UserInfo userInfo;
+        UserInfo userInfo = new UserInfo();
         try {
             SecurityUser securityUser = (SecurityUser) UserContextUtils.getCurrentUser();
-            userInfo = iUserInfoFacade.userDetail(securityUser.getId());
+            if("dids".equals(securityProperties.getType())){
+                userInfo = userFacade.detailBySfzh(securityUser.getIdcard());
+                securityUser.setName(userInfo.getName());
+                securityUser.setUserName(userInfo.getName());
+            }
+            if("dcuc".equals(securityProperties.getType())){
+                userInfo = iUserInfoFacade.userDetail(securityUser.getId());
+            }
+            securityUser.setId(userInfo.getId());
             List<SecurityRight> authmenu = getAuthmenu(securityUser, userInfo);
             securityUser.setSecurityRightList(authmenu);
             //todo 因为数据库不同  后续不需要下面代码
@@ -62,9 +75,6 @@ public class DcucLoginController {
             if (iUserInfoFacade.isRootUser(securityUser.getId()) && StringUtils.isEmpty(rootOrgid)) {
                 rootOrgid = iOrgInfoFacade.getRootOrgId();
             }
-            OrgInfo orgInfo = iOrgInfoFacade.detail(userInfo.getOrgId());
-            securityUser.setSecurityOrg(orgInfo.getId());
-            securityUser.setSecurityOrgName(orgInfo.getFullName());
             securityUser.setSecurityOrg(rootOrgid);
             return securityUser;
         } catch (Exception var3) {