From a3698ecb84be4192754d7b2092491e727dbccec7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 六月 2025 16:51:02 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 6945131..a29282d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -78,8 +78,8 @@
     @Resource
     private DriverPunishMapper driverPunishMapper;
     
-    @Autowired
-    private RedisTemplate redisTemplate;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
     
     @Value("${pushMinistryOfTransport}")
     private boolean pushMinistryOfTransport;
@@ -680,7 +680,7 @@
                 request.setLoginNo(tDriver.getPhone());
                 request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
                 request.setMphone(tDriver.getPhone());
-                request.setEmail("qyt@qyt.com");
+                request.setEmail(tDriver.getPhone() + "@qyt.com");
                 request.setDeptId(0);
                 request.setPositionId(1);
                 request.setSuperLevel(0);
@@ -780,7 +780,7 @@
             request.setLoginNo(tDriver.getPhone());
             request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
             request.setMphone(tDriver.getPhone());
-            request.setEmail("qyt@qyt.com");
+            request.setEmail(tDriver.getPhone() + "@qyt.com");
             request.setDeptId(0);
             request.setPositionId(1);
             request.setSuperLevel(0);
@@ -840,7 +840,7 @@
     public Object delete(@RequestParam Integer tDriverId) {
         TDriver driver = tDriverService.selectById(tDriverId);
         driver.setFlag("3");
-        ShiroUser user = ShiroKit.getUser();
+        ShiroUser user = ShiroExtUtil.getUser();
         User user1 = userService.selectById(user.getId());
         TCompany tCompany = itCompanyService.selectById(user.getObjectId());
         //中台先删除司机
@@ -849,7 +849,7 @@
         request.setMobile(user1.getPhone());
         request.setEntercode(tCompany.getEnterCode());
         StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
-        if ("1".equals(staffNode.getIsValid())) {
+        if (null != staffNode && "1".equals(staffNode.getIsValid())) {
             DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
             deleteStafNodeRequest.setEmpId(driver.getEmpId());
             deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
@@ -914,7 +914,7 @@
                 request.setLoginNo(tDriver.getPhone());
                 request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
                 request.setMphone(tDriver.getPhone());
-                request.setEmail("qyt@qyt.com");
+                request.setEmail(tDriver.getPhone() + "@qyt.com");
                 request.setDeptId(0);
                 request.setPositionId(1);
                 request.setSuperLevel(0);
@@ -1406,7 +1406,7 @@
                             saveStaffNodeRequest.setLoginNo(driver.getPhone());
                             saveStaffNodeRequest.setEmpSex(driver.getSex() == 1 ? "男" : "女");
                             saveStaffNodeRequest.setMphone(driver.getPhone());
-                            saveStaffNodeRequest.setEmail("qyt@qyt.com");
+                            saveStaffNodeRequest.setEmail(driver.getPhone() + "@qyt.com");
                             saveStaffNodeRequest.setDeptId(0);
                             saveStaffNodeRequest.setPositionId(1);
                             saveStaffNodeRequest.setSuperLevel(0);

--
Gitblit v1.7.1