diff --git a/ant-design-vue-jeecg/src/views/system/UserList.vue b/ant-design-vue-jeecg/src/views/system/UserList.vue index c988cd9..6f6c0f8 100644 --- a/ant-design-vue-jeecg/src/views/system/UserList.vue +++ b/ant-design-vue-jeecg/src/views/system/UserList.vue @@ -104,6 +104,7 @@ :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" + class="j-table-force-nowrap" @change="handleTableChange"> <span slot="selectedWarehouses" slot-scope="selectedWarehouses" > diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 6fe4756..de78f2e 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -8,6 +8,7 @@ import java.util.List; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.util.StringUtils; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -197,7 +198,7 @@ public class SysUser implements Serializable { private List<String> selectedWarehouses; public void setSelectedWarehouse(String selectedWarehouse) { - if (selectedWarehouse != null) { + if (!StringUtils.isEmpty(selectedWarehouse)) { this.selectedWarehouse = selectedWarehouse; this.selectedWarehouses = Arrays.asList(selectedWarehouse.split(",")); }