【bug修改】添加用户报角色不能为空 组织机构不能为空

src/views/system/modules/UserModal.vue

@@ -23,7 +23,8 @@
       <a-form :form="form">
 
         <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户账号" @change="event => event.target.value = event.target.value.trim()" :maxLength="50" v-decorator.trim="[ 'username', validatorRules.username]"
+          <a-input placeholder="请输入用户账号" @change="event => event.target.value = event.target.value.trim()"
+                   :maxLength="50" v-decorator.trim="[ 'username', validatorRules.username]"
                    :readOnly="!!model.id" :disabled="disableSubmit || disabledEdit"/>
         </a-form-item>
 
@@ -31,18 +32,23 @@
           <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input-password type="password" placeholder="请输入登录密码" :maxLength="50" autocomplete='new-password'
                               @paste.native.capture.prevent="handleOperate"
-                     @change="event => event.target.value = event.target.value.trim()" :disabled="disableSubmit" v-decorator="[ 'password',validatorRules.password]"/>
+                              @change="event => event.target.value = event.target.value.trim()"
+                              :disabled="disableSubmit" v-decorator="[ 'password',validatorRules.password]"/>
           </a-form-item>
 
           <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input-password type="password" @blur="handleConfirmBlur" :maxLength="50" placeholder="请输入确认密码" :disabled="disableSubmit"
+            <a-input-password type="password" @blur="handleConfirmBlur" :maxLength="50" placeholder="请输入确认密码"
+                              :disabled="disableSubmit"
                               @paste.native.capture.prevent="handleOperate"
-                     @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+                              @change="event => event.target.value = event.target.value.trim()"
+                              v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
           </a-form-item>
         </template>
 
         <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户姓名" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" :maxLength="50" v-decorator.trim="[ 'realname', validatorRules.realname]"/>
+          <a-input placeholder="请输入用户姓名" :disabled="disableSubmit"
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
+                   v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -139,15 +145,19 @@
 
 
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邮箱" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'email', validatorRules.email]" :maxLength="50"/>
+          <a-input placeholder="请输入邮箱" :disabled="disableSubmit"
+                   @change="event => event.target.value = event.target.value.trim()"
+                   v-decorator="[ 'email', validatorRules.email]" :maxLength="50"/>
         </a-form-item>
 
         <a-form-item label="邮箱密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-password placeholder="请输入邮箱密码" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
+          <a-input-password placeholder="请输入邮箱密码" @change="event => event.target.value = event.target.value.trim()"
+                            v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
         </a-form-item>
 
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号码"  @change="event => event.target.value = event.target.value.trim()" :disabled="isDisabledAuth('user:form:phone') || disableSubmit"
+          <a-input placeholder="请输入手机号码" @change="event => event.target.value = event.target.value.trim()"
+                   :disabled="isDisabledAuth('user:form:phone') || disableSubmit"
                    v-decorator="[ 'phone', validatorRules.phone]" :maxLength="11"/>
         </a-form-item>
 
@@ -533,18 +543,24 @@ export default {
           formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
           //update-end-author:taoyan date:2020710 for:多租户配置
           formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(',') : ''
+
           // 部门由多选改成单选 所以不需要单独处理了，但为了历史数据可以使用，对values.selecteddeparts类型进行判断，如果是数组则以逗号分隔转成字符串，若是字符串则直接显示
           if (Object.prototype.toString.call(values.selecteddeparts) === '[object Array]') {
             formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
           }
           // formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
+
+          // 不知道为啥 之前不要这两个字段 后面出bug了 说是这两个没传
+          formData.departIds = values.selecteddeparts
+          formData.roleIds = formData.selectedroles
+          //
           formData.userIdentity = this.identity
           //如果是上级择传入departIds,否则为空
-          if (this.identity === '2') {
+          // if (this.identity === '2') {
-            formData.departIds = this.departIds.join(',')
+          //   formData.departIds = this.departIds.join(',')
-          } else {
+          // } else {
-            formData.departIds = ''
+          //   formData.departIds = ''
-          }
+          // }
           // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
           let obj
           if (!this.model.id) {