保卫部负责人更改

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -2608,28 +2608,39 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             String redisMainRecordKey = "record:" + record.getId(); // 设置redis中主订单键值
             // 获取redis中主订单的所有子订单
             String minRecordList = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(redisMainRecordKey, "minRecord");
+
             //mysql同步redis Record query
+            boolean flagMinRecordListNull = false;
             if(minRecordList==null||minRecordList==""){
                 RedisfifteenRecord redisfifteenRecordv = redisSynchronizeMysqlUtil.queryRedis15Record(record.getId().toString());
-                minRecordList = redisfifteenRecordv.getMinRecord();
+                if(minRecordList!=null){
+                    minRecordList = redisfifteenRecordv.getMinRecord();
+                }else{
+                    flagMinRecordListNull = true;
+                }
             }
-            // 获取所有子订单键值
-            String[] split = minRecordList.replace("[", "").replace("]", "").split(",");
             int pass = 1; // 设置主订单最终状态
-            for (String value : split) {
+            if(!flagMinRecordListNull){
-                // 获取所有子订单状态
+                // 获取所有子订单键值
-                String state = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(value, "state");
+                String[] split = minRecordList.replace("[", "").replace("]", "").split(",");
-                //mysql同步redis MinRecord query      出库后,状态未更正为已完成.看一下state--暂时通过注释掉了mysql同步redis的代码解决,
+                for (String value : split) {
+                    // 获取所有子订单状态
+                    String state = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(value, "state");
+                    //mysql同步redis MinRecord query      出库后,状态未更正为已完成.看一下state--暂时通过注释掉了mysql同步redis的代码解决,
                 /*if(state==null){
                     String minRecordStr = value.split(":")[1];
                     state = redisSynchronizeMysqlUtil.queryRedis15Min(minRecordStr).getState();
                 }*/
-                if ("1".equals(state)) {
+                    if ("1".equals(state)) {
-                    // 如果有子订单未完成
+                        // 如果有子订单未完成
-                    pass = 3;  // 设置主订单状态为处理中
+                        pass = 3;  // 设置主订单状态为处理中
-                    break;
+                        break;
+                    }
                 }
+            }else{
+                pass = 3;
             }
+
             if (pass == 1) { // 如果最终状态为完成
                 // 完成出库的相关操作
                 CompleteOutboundOperations(record, userAgent, userKey, token);

src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java

@@ -102,7 +102,7 @@ public class UserServiceImpl implements UserService {
         Long administrationId = administration.getId();
         if (Long.compare(administrationId, 111) == 0) {
             // 如果是获取保卫部的负责人，则直接获取该用户
-            UserByPort userByNumber = userMapper.findUserByNumber("200855");
+            UserByPort userByNumber = userMapper.findUserByNumber("301350");
             userByPortList.add(userByNumber);
         }
 
@@ -134,7 +134,7 @@ public class UserServiceImpl implements UserService {
         List<UserByPort> userByPortList = new ArrayList<>();
         if (Long.compare(administrationId, 111) == 0) {
             // 如果是获取保卫部的负责人，则直接获取该用户
-            UserByPort userByNumber = userMapper.findUserByNumber("200855");
+            UserByPort userByNumber = userMapper.findUserByNumber("301350");
             userByPortList.add(userByNumber);
         }
         // 查询数据库中当前部门的负责人