From b267af1b816f646fa02c6f4983ebb3f9825cc192 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 15:00:44 +0800
Subject: [PATCH] 单据管理：1.销售账号，在系统里面单据管理这里A销售员做的单子，在它的账号只显示自己的客户信息，不同的账号，看不到别人的信息，管理员是可以全部看的 2.增加客户名称，操作员搜索
---
src/main/java/com/zy/asrs/controller/OrderController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index f47db1a..2361c1f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -16,15 +16,19 @@
import com.zy.common.CodeRes;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class OrderController extends BaseController {
@@ -45,6 +49,9 @@
private LocOwnerService locOwnerService;
@Autowired
private OrderLogService orderLogService;
+
+ @Resource
+ private UserService userService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -83,6 +90,21 @@
@RequestParam Map<String, Object> param){
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ // 闄愬埗閿�鍞鑹插彧鑳界湅鑷繁鍒涘缓鐨勫崟瀛愶紙閿�鍞鑹瞚d鍥哄畾21锛屼笉鑳介殢鎰忎慨鏀癸級
+ User user = getUser();
+ if (user.getRoleId() == 21) {
+ wrapper.eq("create_by", user.getId());
+ }
+ // 璁㈠崟琛ㄥ彧瀛樹簡鎿嶄綔浜篿d,鎵�浠ユ搷浣滀汉濮撳悕鏌ヨ锛屽彧鑳戒粠濮撳悕鍏堝幓鎵緄d锛�
+ Object userName = param.get("oper_memb");
+ if (userName != null && user.getRoleId() != 21) {
+ List<User> users = userService.selectList(new EntityWrapper<User>().like("username", (String) param.get("oper_memb")));
+ if(users.size() > 0){
+ wrapper.in("create_by", users.stream().map(User::getId).collect(Collectors.toList()));
+ }
+ }
+ // 涓婅堪宸茶嚜瀹氫箟鎼滅储锛岀Щ闄ゆ搷浣滀汉濮撳悕鎼滅储
+ param.remove("oper_memb");
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
wrapper.orderBy("settle").orderBy("create_time", false);
@@ -344,10 +366,11 @@
}
@RequestMapping(value = "/orderQuery/auth")
- @ManagerAuth
+// @ManagerAuth
public R query(String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
wrapper.like("order_no", condition);
+ wrapper.le("settle",3);
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Order order : page.getRecords()){
--
Gitblit v1.9.1