From 5c269fc28196cbc4d98ed9d18e354b58868a5b49 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 15:23:40 +0800
Subject: [PATCH] 初步完成调试
---
src/main/java/com/zy/common/utils/RoleUtils.java | 162 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/RoleUtils.java b/src/main/java/com/zy/common/utils/RoleUtils.java
index bafc9a2..e8a6ead 100644
--- a/src/main/java/com/zy/common/utils/RoleUtils.java
+++ b/src/main/java/com/zy/common/utils/RoleUtils.java
@@ -56,32 +56,32 @@
*/
public static <T> void addRoleWrapperByCrn(Long userId, EntityWrapper<T> wrapper) {
// super璐﹀彿
- if (userId == 9527) {
- return;
- }
-
- UserService userService = SpringUtils.getBean(UserService.class);
- User user = userService.selectById(userId);
- String roleName = user.getRoleName();
-
- // 绠＄悊鍛樿鑹�
- if (Cools.isEmpty(roleName)) {
- wrapper.eq("1", 0);
- } else if (roleName.equals("绠＄悊鍛�")) {
- return;
- }
-
- // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
- String roleLeaderCode = user.getRoleLeaderCode();
- if (Cools.isEmpty(roleLeaderCode)) {
- wrapper.eq("1", 0);
- } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
- wrapper.le("crn_no", 4); // 闄愬埗1~4鍙峰爢鍨涙満
- } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
- wrapper.eq("crn_no", 7); // 闄愬埗7鍙峰爢鍨涙満
- } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
- wrapper.in("crn_no", 8, 9); //闄愬埗8锛�9鍙峰爢鍨涙満
- }
+// if (userId == 9527) {
+// return;
+// }
+//
+// UserService userService = SpringUtils.getBean(UserService.class);
+// User user = userService.selectById(userId);
+// String roleName = user.getRoleName();
+//
+// // 绠＄悊鍛樿鑹�
+// if (Cools.isEmpty(roleName)) {
+// wrapper.eq("1", 0);
+// } else if (roleName.equals("绠＄悊鍛�")) {
+// return;
+// }
+//
+// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
+// String roleLeaderCode = user.getRoleLeaderCode();
+// if (Cools.isEmpty(roleLeaderCode)) {
+// wrapper.eq("1", 0);
+// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
+// wrapper.le("crn_no", 4); // 闄愬埗1~4鍙峰爢鍨涙満
+// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
+// wrapper.eq("crn_no", 7); // 闄愬埗7鍙峰爢鍨涙満
+// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
+// wrapper.in("crn_no", 8, 9); //闄愬埗8锛�9鍙峰爢鍨涙満
+// }
}
@@ -90,33 +90,33 @@
*/
public static <T> void addRoleWrapperByLocNo(Long userId, EntityWrapper<T> wrapper) {
// super璐﹀彿
- if (userId == 9527) {
- return;
- }
-
- UserService userService = SpringUtils.getBean(UserService.class);
- User user = userService.selectById(userId);
- String roleName = user.getRoleName();
-
- // 绠＄悊鍛樿鑹�
- if (Cools.isEmpty(roleName)) {
- wrapper.eq("1", 0);
- return;
- } else if (roleName.equals("绠＄悊鍛�")) {
- return;
- }
-
- // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
- String roleLeaderCode = user.getRoleLeaderCode();
- if (Cools.isEmpty(roleLeaderCode)) {
- wrapper.eq("1", 0);
- } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
- wrapper.addFilter("LEFT(loc_no,2)<=16"); // 闄愬埗1~16鎺�
- } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
- wrapper.addFilter("LEFT(loc_no,2)>=17 and LEFT(loc_no,2)<=37"); // 闄愬埗17~37鎺�
- } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
- wrapper.addFilter("LEFT(loc_no,2)>=38"); //闄愬埗38~53鎺�
- }
+// if (userId == 9527) {
+// return;
+// }
+//
+// UserService userService = SpringUtils.getBean(UserService.class);
+// User user = userService.selectById(userId);
+// String roleName = user.getRoleName();
+//
+// // 绠＄悊鍛樿鑹�
+// if (Cools.isEmpty(roleName)) {
+// wrapper.eq("1", 0);
+// return;
+// } else if (roleName.equals("绠＄悊鍛�")) {
+// return;
+// }
+//
+// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
+// String roleLeaderCode = user.getRoleLeaderCode();
+// if (Cools.isEmpty(roleLeaderCode)) {
+// wrapper.eq("1", 0);
+// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
+// wrapper.addFilter("LEFT(loc_no,2)<=16"); // 闄愬埗1~16鎺�
+// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
+// wrapper.addFilter("LEFT(loc_no,2)>=17 and LEFT(loc_no,2)<=37"); // 闄愬埗17~37鎺�
+// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
+// wrapper.addFilter("LEFT(loc_no,2)>=38"); //闄愬埗38~53鎺�
+// }
}
@@ -125,34 +125,34 @@
*/
public static <T> void addRoleWrapperByBarcode(Long userId, EntityWrapper<T> wrapper) {
// super璐﹀彿
- if (userId == 9527) {
- return;
- }
-
- UserService userService = SpringUtils.getBean(UserService.class);
- User user = userService.selectById(userId);
- String roleName = user.getRoleName();
-
- // 绠＄悊鍛樿鑹�
- if (Cools.isEmpty(roleName)) {
- wrapper.eq("1", 0);
- return;
- } else if (roleName.equals("绠＄悊鍛�")) {
- return;
- }
-
- // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
- String roleLeaderCode = user.getRoleLeaderCode();
- if (Cools.isEmpty(roleLeaderCode)) {
- wrapper.eq("1", 0);
- } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
- // TODO 鍫嗗灈鏈哄紑澶存湭纭
-// wrapper.addFilter("LEFT(zpallet,3) =''"); // 闄愬埗
- } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
- wrapper.addFilter("LEFT(zpallet,3) ='SXK'"); // 闄愬埗SXK
- } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
- wrapper.addFilter("LEFT(zpallet,3) ='CTU'"); //闄愬埗CTU
- }
+// if (userId == 9527) {
+// return;
+// }
+//
+// UserService userService = SpringUtils.getBean(UserService.class);
+// User user = userService.selectById(userId);
+// String roleName = user.getRoleName();
+//
+// // 绠＄悊鍛樿鑹�
+// if (Cools.isEmpty(roleName)) {
+// wrapper.eq("1", 0);
+// return;
+// } else if (roleName.equals("绠＄悊鍛�")) {
+// return;
+// }
+//
+// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
+// String roleLeaderCode = user.getRoleLeaderCode();
+// if (Cools.isEmpty(roleLeaderCode)) {
+// wrapper.eq("1", 0);
+// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
+// // TODO 鍫嗗灈鏈哄紑澶存湭纭
+//// wrapper.addFilter("LEFT(zpallet,3) =''"); // 闄愬埗
+// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
+// wrapper.addFilter("LEFT(zpallet,3) ='SXK'"); // 闄愬埗SXK
+// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
+// wrapper.addFilter("LEFT(zpallet,3) ='CTU'"); //闄愬埗CTU
+// }
}
}
--
Gitblit v1.9.1