diff --git a/oms_web/oms_vue/src/views/manage/delivery/index.vue b/oms_web/oms_vue/src/views/manage/delivery/index.vue
index 119d0f81..cd636a73 100644
--- a/oms_web/oms_vue/src/views/manage/delivery/index.vue
+++ b/oms_web/oms_vue/src/views/manage/delivery/index.vue
@@ -186,7 +186,7 @@
-
+
diff --git a/oms_web/oms_vue/src/views/system/partner/selectPartner.vue b/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
index 99796937..27e6bfa7 100644
--- a/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
+++ b/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
@@ -70,9 +70,9 @@ export default {
}
},
},
- created() {
- this.getList();
- },
+ // created() {
+ // this.getList();
+ // },
methods: {
/** 查询进货商列表 */
getList() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 76934326..a0e239c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -465,6 +465,20 @@ public class SysUserController extends BaseController
}
return toAjax(userService.deleteUserByIds(ids));
}
+ /**
+ * 用户授权角色
+ */
+ @Log(title = "用户管理", businessType = BusinessType.GRANT)
+ @PutMapping("/authRole")
+ @ResponseBody
+ public AjaxResult authRole(Long userId, Long[] roleIds)
+ {
+ userService.checkUserDataScope(userId);
+ roleService.checkRoleDataScope(roleIds);
+ userService.insertUserAuth(userId, roleIds);
+ AuthorizationUtils.clearAllCachedAuthorizationInfo();
+ return success();
+ }
// ----------------------新增的个人信息 业务处理---------------------------
// /**
// * 个人信息
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index fd039f47..11d673bd 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
+import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
@@ -84,6 +85,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
* @return 产品库存
*/
@Override
+ @DataScope(deptAlias = "t8", userAlias = "t8")
public List selectInventoryDeliveryList(InventoryDelivery inventoryDelivery) {
return inventoryDeliveryMapper.selectInventoryDeliveryList(inventoryDelivery);
}
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
index 7210e6b1..759269d5 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join project_info t5 on t4.project_id=t5.id
left join sys_user t6 on t1.create_by = t6.user_id
left join product_info t7 on t3.product_code = t7.product_code
+ left join sys_user t8 on t4.duty = t8.user_id