diff --git a/login-oauth2-client/src/main/resources/templates/department/user/select-user.html b/login-oauth2-client/src/main/resources/templates/department/user/select-user.html index cbb56f53..fe98c310 100644 --- a/login-oauth2-client/src/main/resources/templates/department/user/select-user.html +++ b/login-oauth2-client/src/main/resources/templates/department/user/select-user.html @@ -142,7 +142,7 @@ } else { avatarDom = ' '; } - userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; + userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; } $('#userWrapper').append(userDom); } @@ -231,10 +231,11 @@ ids: selectedUserIds.split('\_') }, null, function(code, data) { for(var i = 0, item; item = data[i++]; ) { - selectUser(item.userId, item.userName); + selectUser(item.userId, item.userName, item.userUsername); selectDepartmentUserOldArray.push({ userId: item.userId, - userName: item.userName + userName: item.userName, + username: item.userUsername }); } callback(); @@ -292,12 +293,13 @@ } } // 选择人员 - function selectUser(userId, userName, isOnlySelect) { + function selectUser(userId, userName, username, isOnlySelect) { if(!isUserSelected(userId)) { $('#user_'+ userId).addClass('user-selected'); selectDepartmentUserArray.push({ userId: userId, userName: userName + username: username }); $('#selectUsers').append(''+ userName +' '); $('#selected_user_'+ userId).focus(); @@ -309,7 +311,7 @@ } $(document.body).on('click', '*[lay-click-user]', null, function() { var data = this.dataset; - selectUser(data.userid, data.username); + selectUser(data.userid, data.username, data.userUsername); }); $(document.body).on('click', '*[lay-click-removeuser]', null, function() { var data = this.dataset; @@ -318,7 +320,7 @@ $(document.body).on('click', '*[lay-click-select-all-user]', null, function() { $('#userWrapper').children().each(function() { var data = this.dataset; - selectUser(data.userid, data.username, true); + selectUser(data.userid, data.username, data.userUsername, true); }); }); $(document.body).on('click', '*[lay-click-clear-all-user]', null, function() { diff --git a/service-department/src/main/resources/templates/department/user/select-user.html b/service-department/src/main/resources/templates/department/user/select-user.html index f79db9a2..fb45baa7 100644 --- a/service-department/src/main/resources/templates/department/user/select-user.html +++ b/service-department/src/main/resources/templates/department/user/select-user.html @@ -142,7 +142,7 @@ } else { avatarDom = ' '; } - userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; + userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; } $('#userWrapper').append(userDom); } @@ -169,7 +169,7 @@ } else { avatarDom = ' '; } - userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; + userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; } $('#userWrapper').append(userDom); } @@ -204,6 +204,7 @@ top.restAjax.get(top.restAjax.path('api/department/user/list/{department}', [selectedParentId]), { keywords: searchUser }, null, function(code, data) { + console.log(data); addSearchUserDom(data); }, function(code, data) { top.dialog.msg(data.msg); @@ -231,10 +232,11 @@ ids: selectedUserIds.split('\_') }, null, function(code, data) { for(var i = 0, item; item = data[i++]; ) { - selectUser(item.userId, item.userName); + selectUser(item.userId, item.userName, item.userUsername); selectDepartmentUserOldArray.push({ userId: item.userId, - userName: item.userName + userName: item.userName, + username: item.userUsername }); } callback(); @@ -292,12 +294,13 @@ } } // 选择人员 - function selectUser(userId, userName, isOnlySelect) { + function selectUser(userId, userName, username, isOnlySelect) { if(!isUserSelected(userId)) { $('#user_'+ userId).addClass('user-selected'); selectDepartmentUserArray.push({ userId: userId, - userName: userName + userName: userName, + username: username }); $('#selectUsers').append(''+ userName +' '); $('#selected_user_'+ userId).focus(); @@ -309,7 +312,7 @@ } $(document.body).on('click', '*[lay-click-user]', null, function() { var data = this.dataset; - selectUser(data.userid, data.username); + selectUser(data.userid, data.username, data.userUsername); }); $(document.body).on('click', '*[lay-click-removeuser]', null, function() { var data = this.dataset; @@ -318,7 +321,7 @@ $(document.body).on('click', '*[lay-click-select-all-user]', null, function() { $('#userWrapper').children().each(function() { var data = this.dataset; - selectUser(data.userid, data.username, true); + selectUser(data.userid, data.username, data.userUsername, true); }); }); $(document.body).on('click', '*[lay-click-clear-all-user]', null, function() {