Commit c68e08ed authored by 皮倩雯's avatar 皮倩雯

fix: '修复机构管理搜索功能bug'

parent 53c15328
Pipeline #65875 passed with stages
...@@ -177,6 +177,7 @@ const UserManage = () => { ...@@ -177,6 +177,7 @@ const UserManage = () => {
const [siteList, setSiteList] = useState([]); const [siteList, setSiteList] = useState([]);
const setRowClassName = record => const setRowClassName = record =>
record.userID === selectColor.userID ? styles.clickRowStyle : ''; record.userID === selectColor.userID ? styles.clickRowStyle : '';
// 用户表列名 // 用户表列名
const columns = [ const columns = [
{ {
...@@ -1069,12 +1070,12 @@ const UserManage = () => { ...@@ -1069,12 +1070,12 @@ const UserManage = () => {
// 查找用户 // 查找用户
const submitSearchUser = () => { const submitSearchUser = () => {
if (!searchWord || searchWord.trim(' ').length == 0) { // if (!searchWord || searchWord.trim(' ').length == 0) {
message.warning('请输入搜索内容'); // message.warning('请输入搜索内容');
return; // return;
} // }
let data = searchWord != '' ? { key: searchWord } : '';
GetUserByKeyNew({ key: searchWord }) GetUserByKeyNew(data)
.then(res => { .then(res => {
if (res.code === 0) { if (res.code === 0) {
setSelectedRowKeys([]); // 重置选中用户数 setSelectedRowKeys([]); // 重置选中用户数
...@@ -1599,6 +1600,7 @@ const UserManage = () => { ...@@ -1599,6 +1600,7 @@ const UserManage = () => {
}} }}
/> />
</Tooltip> </Tooltip>
</div> </div>
<hr style={{ width: '95%', color: '#eeecec', marginLeft: '15px' }} /> <hr style={{ width: '95%', color: '#eeecec', marginLeft: '15px' }} />
{treeData.length > 0 && ( {treeData.length > 0 && (
...@@ -1743,6 +1745,7 @@ const UserManage = () => { ...@@ -1743,6 +1745,7 @@ const UserManage = () => {
updateTrees={updateTrees} updateTrees={updateTrees}
onCancel={() => setDeleteOrgVisible(false)} onCancel={() => setDeleteOrgVisible(false)}
/> />
{/* 关联角色 */} {/* 关联角色 */}
<RelateRoleModal <RelateRoleModal
currentUser={currentUser} currentUser={currentUser}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment