Merge remote-tracking branch 'origin/master'

src/main/java/org/sss/presentation/noui/controller/UkeyLoginController.java

@@ -44,10 +44,12 @@ public class UkeyLoginController {
             log.info("====getLoginidByDN====map"+map);
             if(map.containsKey("nam")) {
                 String loginid = map.get("nam").toString();
+                String dncode = map.get("ukey").toString();
                 log.info("====getUserByDn====loginid" + loginid);
-                if (StringUtils.isNotBlank(loginid)) {
+                if (StringUtils.isNotBlank(loginid) && StringUtils.isNotBlank(dncode)) {
                     retDatamap.put("msgCode", "0000");
                     retDatamap.put("loginid", loginid);
+                    retDatamap.put("dncode", dncode);
                     return ResultUtil.result(ErrorCodes.SUCCESS, ErrorCodes.SUCCESS_INFO, retDatamap, noUiVersion.getVersion());
                 }
             }