Merge branch 'huangzqa-fix-20210422' into 'release/v2.1.1-beta'

Huangzqa fix 20210422

See merge request dcuc-tjdsj/auth-back!21

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

@@ -56,18 +56,17 @@ public class DcucLoginController {
 
     @GetMapping(value = "/info")
     public SecurityUser info(@RequestHeader("userToken") String userToken,
-                             @RequestHeader("appToken") String appToken) {
+                             @RequestHeader(value = "appToken", required = false) String appToken) {
         logger.info("UserToken:{},appToken:{}", userToken, appToken);
 
-        UserInfo userInfo = new UserInfo();
+        UserInfo userInfo;
         try {
             SecurityUser securityUser = (SecurityUser) UserContextUtils.getCurrentUser();
             if ("dids".equals(securityProperties.getType())) {
                 userInfo = userFacade.detailBySfzh(securityUser.getIdcard());
                 securityUser.setName(userInfo.getName());
                 securityUser.setUserName(userInfo.getName());
-            }
-            if ("dcuc".equals(securityProperties.getType())) {
+            } else {
                 userInfo = iUserInfoFacade.userDetail(securityUser.getId());
             }
             String userId = securityUser.getId();
@@ -76,9 +75,6 @@ public class DcucLoginController {
             }
             List<SecurityRight> authmenu = getAuthmenu(securityUser, userInfo);
             securityUser.setSecurityRightList(authmenu);
-            //todo 因为数据库不同  后续不需要下面代码
-            securityUser.setIdcard(userInfo.getIdcard());
-            securityUser.setName(userInfo.getName());
             //ADMIN管理员
             String rootOrgid = userInfo.getOrgId();
             if (iUserInfoFacade.isRootUser(securityUser.getId()) && StringUtils.isEmpty(rootOrgid)) {
@@ -94,6 +90,7 @@ public class DcucLoginController {
             logger.error("获取用户信息异常", var3);
             throw new SecurityException("获取用户信息异常", var3);
         }
+
     }