用户新增部门BUG修复

Signed-off-by: TanYibin <5491541@qq.com>

用户新增部门BUG修复
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬 · 肖超群
1 parent db9a9783
Showing 7 changed files with 35 additions and 50 deletions
ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/receiptType/controller/ReceiptTypeController.java
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
@@ -232,13 +232,13 @@ export default {
 * https://github.com/zhangdaiscott/jeecg-boot/issues/1779
 */
  
-/deep/ .imgupload .iconp {
+::v-deep .imgupload .iconp {
   padding: 20px;
 }
  
 /* update--end--autor:lvdandan-----date:20201016------for：j-image-upload图片组件单张图片详情回显空白*/
  
-/deep/ .image-upload-single-over .ant-upload-select {
+::v-deep .image-upload-single-over .ant-upload-select {
   display: none
 }
 </style>
@@ -157,7 +157,7 @@ export default {
 </script>
  
 <style scoped>
-/deep/ .jvxe-select-input .ant-input {
+::v-deep .jvxe-select-input .ant-input {
   border: none !important;
 }
 </style>
 \ No newline at end of file
@@ -72,8 +72,7 @@
  
         <!--部门分配-->
         <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"
-                           :treeOpera="true">>
+          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">
           </j-select-depart>
         </a-form-model-item>
  
@@ -176,10 +175,10 @@ export default {
         username: [{required: true, message: '请输入用户账号!'},
           {validator: this.validateUsername,}],
         selectedWarehouse: [
-          {required: true, message: '请选择仓库!'},
+          {required: true, message: '请选择仓库!', trigger: "change" , validator: 'click'}
         ],
         selectedRoles: [
-          {required: true, message: '请选择角色!'},
+          {required: true, message: '请选择角色!', trigger: "change" , validator: 'click'}
         ],
         password: [
           {validator: this.validateToNextPassword, trigger: 'change'}],
@@ -297,7 +296,7 @@ export default {
       queryall().then((res) => {
         if (res.success) {
           this.rolesOptions = res.result.map((item, index, arr) => {
-            let c = {label: item.roleName, value: item.roleName}
+            let c = {label: item.roleName, value: item.id + ""}
             return c;
           })
           console.log('this.rolesOptions: ', this.rolesOptions)
@@ -308,7 +307,7 @@ export default {
       getAllWarehouseList().then((res) => {
         if (res.success) {
           this.warehouseOptions = res.result.map((item, index, arr) => {
-            let c = {label: item.name, value: item.name}
+            let c = {label: item.name, value: item.code}
             return c;
           })
           console.log('this.warehouseOptions: ', this.warehouseOptions)
@@ -559,7 +558,7 @@ export default {
 }
  
 /*【JTC-502】 添加用户两个滚动条*/
-/deep/ .ant-drawer-body {
+::v-deep .ant-drawer-body {
   padding-bottom: 53px;
 }
  
@@ -525,7 +525,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
-    public void editUser(SysUser user, String roles, String departs, String warehouses) {
+    public void editUser(SysUser user, String roles, String departs, String selectedWarehouse) {
         // step.1 修改用户基础信息
         this.updateById(user);
         // step.2 修改角色
@@ -534,12 +534,10 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         if (oConvertUtils.isNotEmpty(roles)) {
             String[] arr = roles.split(",");
             for (String roleId : arr) {
-                SysRole sysRole = sysRoleService.getRoleByName(roleId);
-                SysUserRole userRole = new SysUserRole(Integer.valueOf(user.getId()), Integer.valueOf(sysRole.getId()));
+                SysUserRole userRole = new SysUserRole(Integer.valueOf(user.getId()), Integer.valueOf(roleId));
                 sysUserRoleMapper.insert(userRole);
             }
         }
-
         // step.3 修改部门
         String[] arr = {};
         if (oConvertUtils.isNotEmpty(departs)) {
@@ -578,19 +576,17 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         // 更新手机号、邮箱空字符串为 null
         userMapper.updateNullByEmptyString("email");
         userMapper.updateNullByEmptyString("phone");
-
         // step5
         LambdaQueryWrapper<SysUserWarehouse> sysUserWarehouseLambdaQueryWrapper = Wrappers.lambdaQuery();
         sysUserWarehouseLambdaQueryWrapper.eq(SysUserWarehouse::getUserid, user.getId());
         sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper);
  
-        if (StringUtils.isNotEmpty(warehouses)) {
-            String[] strs = warehouses.split(",");
-            for (String warehouseName : strs) {
-                Warehouse warehouse = warehouseService.getWarehouseByName(warehouseName);
+        if (StringUtils.isNotEmpty(selectedWarehouse)) {
+            String[] strs = selectedWarehouse.split(",");
+            for (String warehouseCode : strs) {
                 SysUserWarehouse sysUserWarehouse = new SysUserWarehouse();
                 sysUserWarehouse.setUserid(user.getId());
-                sysUserWarehouse.setWarehousecode(warehouse.getCode());
+                sysUserWarehouse.setWarehousecode(warehouseCode);
                 sysUserWarehouse.setUsername(user.getRealname());
                 if (!sysUserWarehouseService.save(sysUserWarehouse)) {
                     throw new JeecgBootException("保存用户和仓库关系失败");
@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
  
 import org.jeecg.modules.wms.config.company.entity.Company;
 import org.jeecg.modules.wms.config.company.service.ICompanyService;
+import org.jeecg.modules.wms.config.supplier.entity.Supplier;
 import org.jeecg.modules.wms.config.zone.entity.Zone;
 import org.jeecg.utils.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -180,10 +181,9 @@ public class CompanyController extends JeecgController&lt;Company, ICompanyService&gt;
      * @param req
      */
     @RequestMapping(value = "/getCompanyList")
-    public Result<?> getCompanyList(HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+    public Result<?> getCompanyList(HttpServletRequest request) {
         LambdaQueryWrapper<Company> companyLambdaQueryWrapper = Wrappers.lambdaQuery();
-        companyLambdaQueryWrapper.eq(Company::getWarehouseCode, warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(companyLambdaQueryWrapper, Company.class, request);
         List<Company> companyList = companyService.list(companyLambdaQueryWrapper);
         return Result.OK(companyList);
     }
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.wms.config.customer.entity.Customer;
 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
 import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
+import org.jeecg.modules.wms.config.supplier.entity.Supplier;
 import org.jeecg.utils.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -178,10 +179,9 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
      * @param req
      */
     @RequestMapping(value = "/getReceiptTypeList")
-    public Result<?> getReceiptTypeList(HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+    public Result<?> getReceiptTypeList(HttpServletRequest request) {
         LambdaQueryWrapper<ReceiptType> receiptTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
-        receiptTypeLambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(receiptTypeLambdaQueryWrapper, ReceiptType.class, request);
         List<ReceiptType> receiptTypeList = receiptTypeService.list(receiptTypeLambdaQueryWrapper);
         return Result.OK(receiptTypeList);
     }
@@ -111,37 +111,27 @@ public class HuahengJwtUtil {
     }
  
     public static <T> void setWarehouseCode(HttpServletRequest request, T t) {
-        try {
-            Field warehouseCodeField = ReflectUtil.getField(t.getClass(), "warehouseCode");
-            if (warehouseCodeField != null) {
-                List<String> roles = HuahengJwtUtil.getRolesByToken(request);
-                String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(request);
-                if (roles.contains("inspector")) {
-                    return;
-                }
-                ReflectUtil.setFieldValue(t, "warehouseCode", warehouseCode);
-
-            }
-        } catch (Exception e) {
+        List<String> roles = HuahengJwtUtil.getRolesByToken(request);
+        if (roles.contains("inspector")) {
             return;
         }
+        Field warehouseCodeField = ReflectUtil.getField(t.getClass(), "warehouseCode");
+        if (warehouseCodeField != null) {
+            String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(request);
+            ReflectUtil.setFieldValue(t, "warehouseCode", warehouseCode);
+        }
     }
  
     public static <T> void setWarehouseCode(LambdaQueryWrapper<T> lambdaQueryWrapper, Class<T> clazz, HttpServletRequest request) {
-        try {
-            Field warehouseCodeField = ReflectUtil.getField(clazz, "warehouseCode");
-            if (warehouseCodeField != null) {
-                List<String> roles = HuahengJwtUtil.getRolesByToken(request);
-                String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(request);
-                if (roles.contains("inspector")) {
-                    return;
-                }
-                lambdaQueryWrapper.apply("warehouse_code = {0}", warehouseCode);
-
-            }
-        } catch (Exception e) {
+        List<String> roles = HuahengJwtUtil.getRolesByToken(request);
+        if (roles.contains("inspector")) {
             return;
         }
+        Field warehouseCodeField = ReflectUtil.getField(clazz, "warehouseCode");
+        if (warehouseCodeField != null) {
+            String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(request);
+            lambdaQueryWrapper.apply("warehouse_code = {0}", warehouseCode);
+        }
     }
  
     /**