用户和仓库关系

肖超群
1 parent 51b04cd8
Showing 2 changed files with 17 additions and 11 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -263,16 +263,22 @@ export default {
           dataIndex: 'phone'
         },
         {
-          title: '部门',
+          title: '所属仓库',
           align: "center",
-          width: 180,
-          dataIndex: 'orgCodeTxt'
-        },
-        {
-          title: '负责部门',
-          align: "center",
-          dataIndex: 'departIds_dictText'
+          width: 100,
+          dataIndex: 'selectedWarehouse'
         },
+        // {
+        //   title: '部门',
+        //   align: "center",
+        //   width: 180,
+        //   dataIndex: 'orgCodeTxt'
+        // },
+        // {
+        //   title: '负责部门',
+        //   align: "center",
+        //   dataIndex: 'departIds_dictText'
+        // },
         {
           title: '状态',
           align: "center",
@@ -8,6 +8,7 @@ import javax.annotation.Resource;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
@@ -28,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONObject;
-import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -557,9 +557,9 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         // step5
         LambdaQueryWrapper<SysUserWarehouse> sysUserWarehouseLambdaQueryWrapper = Wrappers.lambdaQuery();
         sysUserWarehouseLambdaQueryWrapper.eq(SysUserWarehouse::getUserid, user.getId());
-        sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper{
+        sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper);
-                if (StringUtils.isNotEmpty(warehouses)) {
+        if (StringUtils.isNotEmpty(warehouses)) {
             String[] strs = warehouses.split(",");
             for (String warehouseCode : strs) {
                 SysUserWarehouse sysUserWarehouse = new SysUserWarehouse();