Commit 6ff036f9e72987ef8029f51d12987a8baebec7f9
1 parent
44f40ed4
用户页显示优化
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
3 additions
and
1 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
... | ... | @@ -104,6 +104,7 @@ |
104 | 104 | :pagination="ipagination" |
105 | 105 | :loading="loading" |
106 | 106 | :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
107 | + class="j-table-force-nowrap" | |
107 | 108 | @change="handleTableChange"> |
108 | 109 | |
109 | 110 | <span slot="selectedWarehouses" slot-scope="selectedWarehouses" > |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java
... | ... | @@ -8,6 +8,7 @@ import java.util.List; |
8 | 8 | import org.jeecg.common.aspect.annotation.Dict; |
9 | 9 | import org.jeecgframework.poi.excel.annotation.Excel; |
10 | 10 | import org.springframework.format.annotation.DateTimeFormat; |
11 | +import org.springframework.util.StringUtils; | |
11 | 12 | |
12 | 13 | import com.baomidou.mybatisplus.annotation.IdType; |
13 | 14 | import com.baomidou.mybatisplus.annotation.TableField; |
... | ... | @@ -197,7 +198,7 @@ public class SysUser implements Serializable { |
197 | 198 | private List<String> selectedWarehouses; |
198 | 199 | |
199 | 200 | public void setSelectedWarehouse(String selectedWarehouse) { |
200 | - if (selectedWarehouse != null) { | |
201 | + if (!StringUtils.isEmpty(selectedWarehouse)) { | |
201 | 202 | this.selectedWarehouse = selectedWarehouse; |
202 | 203 | this.selectedWarehouses = Arrays.asList(selectedWarehouse.split(",")); |
203 | 204 | } |
... | ... |