完善用户仓库选择

肖超群
1 parent c4bb74af
Showing 4 changed files with 18 additions and 5 deletions
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -61,7 +61,7 @@
           </j-multi-select-tag>
         </a-form-model-item>
  
-        <a-form-model-item label="仓库分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable">
+        <a-form-model-item label="仓库分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="selectedWarehouse">
           <j-multi-select-tag
             :disabled="disableSubmit"
             v-model="model.selectedWarehouse"
@@ -175,6 +175,9 @@ export default {
       validatorRules: {
         username: [{required: true, message: '请输入用户账号!'},
           {validator: this.validateUsername,}],
+        selectedWarehouse: [
+          {required: true, message: '请选择仓库!'},
+        ],
         password: [
           {validator: this.validateToNextPassword, trigger: 'change'}],
         confirmpassword: [{required: true, message: '请重新输入登录密码!',},
@@ -185,7 +188,7 @@ export default {
         roles: {},
         workNo: [{required: true, message: '请输入工号'},
           {validator: this.validateWorkNo}],
-        telephone: [{pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码'},]
+        telephone: [{pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码'},],
       },
       departIdShow: false,
       title: "操作",
@@ -42,6 +42,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -178,6 +179,9 @@ public class SysUserController {
             user.setPassword(passwordEncode);
             user.setStatus(1);
             user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            if (StringUtils.isEmpty(selectedWarehouse)) {
+                throw new ServiceException("仓库不能为空");
+            }
             // 保存用户走一个service 保证事务
             sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse);
             result.success("添加成功！");
@@ -211,6 +215,9 @@ public class SysUserController {
                     // vue3.0前端只传递了departIds
                     departs = user.getDepartIds();
                 }
+                if (StringUtils.isEmpty(selectedWarehouse)) {
+                    throw new ServiceException("仓库不能为空");
+                }
                 // 修改用户走一个service 保证事务
                 sysUserService.editUser(user, roles, departs, selectedWarehouse);
                 result.success("修改成功!");
@@ -177,6 +177,11 @@ public class SysUser implements Serializable {
      */
     private String relTenantIds;
  
+    /**
+     * 多租户id配置，编辑用户的时候设置
+     */
+    private String selectedWarehouse;
+
     /** 设备id uniapp推送用 */
     private String clientId;
 }
@@ -557,9 +557,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         // step5
         LambdaQueryWrapper<SysUserWarehouse> sysUserWarehouseLambdaQueryWrapper = Wrappers.lambdaQuery();
         sysUserWarehouseLambdaQueryWrapper.eq(SysUserWarehouse::getUserid, user.getId());
-        if (!sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper)) {
-            throw new ServiceException("删除用户和仓库关系失败");
-        }
+        sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper);
         if (StringUtils.isNotEmpty(warehouses)) {
             String[] strs = warehouses.split(",");
             for (String warehouseCode : strs) {