Fixed

src/main/java/cn/quantgroup/xyqb/config/data/RedisConfig.java

@@ -114,7 +114,7 @@ public class RedisConfig {
         template.setDefaultSerializer(jdkSerializationRedisSerializer);
         template.setConnectionFactory(factory);
 
-        XyqbSessionContextHolder.redisTemplate = stringRedisTemplate(factory);
+        XyqbSessionContextHolder.setRedisTemplate(stringRedisTemplate(factory));
         return template;
     }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/querylog/UserQueryLogController.java

@@ -198,7 +198,9 @@ public class UserQueryLogController {
         //保存记录
         UserQueryLog log = new UserQueryLog();
         log.setQueryItems(columns.replace(Constants.USER_ID, "用户ID").replace(Constants.PHONE_NO, "手机号").replace(Constants.USER_NAME, "姓名").replace(Constants.ID_NO, "身份证号").replace(Constants.BANK_CARD, "银行卡号").replace(Constants.ADDRESS, "地址"));
-        log.setResultAmount(userDetailPage.getTotalElements());
+        if(userDetailPage != null){
+            log.setResultAmount(userDetailPage.getTotalElements());
+        }
         //转换存储
         log.setQueryCondition(key.replace(Constants.USER_ID, "用户ID").replace(Constants.PHONE_NO, "手机号").replace(Constants.USER_NAME, "姓名").replace(Constants.ID_NO, "身份证号"));
         log.setQueryDetail(keyValues.replace("\n", ";"));
@@ -208,8 +210,10 @@ public class UserQueryLogController {
         uqi.setPageId(pageId);
         uqi.setPageList(userQueryInfos);
         uqi.setPageSize(pageSize);
-        uqi.setPages(userDetailPage.getTotalPages());
-        uqi.setTotal(userDetailPage.getTotalElements());
+        if(userDetailPage != null){
+            uqi.setPages(userDetailPage.getTotalPages());
+            uqi.setTotal(userDetailPage.getTotalElements());
+        }
         return JsonResult.buildSuccessResult("查询成功", uqi);
     }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -1037,20 +1037,7 @@ public class InnerController implements IBaseController {
      */
     @RequestMapping("/user/save_multi")
     @ApiOperation(value = "保存多种用户信息", httpMethod = "POST")
-    public JsonResult saveMulti(
-            String registeredFrom,
-            String channelId,
-            String phoneNo,
-            String name,
-            String idNo,
-            String provinceCode,
-            String province,
-            String cityCode,
-            String city,
-            String districtCode,
-            String district,
-            String address,
-            String contacts, @RequestParam(defaultValue = "0", required = false) Long btRegisterChannelId) {
+    public JsonResult saveMulti(String registeredFrom, String channelId, String phoneNo, String name, String idNo, String provinceCode, String province, String cityCode, String city, String districtCode, String district, String address, String contacts, @RequestParam(defaultValue = "0", required = false) Long btRegisterChannelId) {
         if (!NumberUtils.isDigits(registeredFrom)) {
             return JsonResult.buildErrorStateResult("注册渠道异常.", null);
         }
@@ -1093,7 +1080,6 @@ public class InnerController implements IBaseController {
             if (StringUtils.isBlank(address)) {
                 return JsonResult.buildErrorStateResult("详细地址异常.", null);
             }
-
             addressObj = new Address();
             addressObj.setProvinceCode(Long.valueOf(provinceCode));
             addressObj.setProvince(province);
@@ -1112,8 +1098,7 @@ public class InnerController implements IBaseController {
         List<Contact> contactList = null;
         // 目前对空白字符串和null值容错，因是api调用，不考虑对非法格式容错（会阻断注册）
         if (StringUtils.isNotBlank(contacts)) {
-            contactList = JSONObject.parseObject(contacts, new TypeReference<List<Contact>>() {
-            });
+            contactList = JSONObject.parseObject(contacts, new TypeReference<List<Contact>>() {});
             for (Contact contact : contactList) {
                 contact.setRelation(contact.getRelation() == null ? Relation.OTHER : contact.getRelation());
                 Tuple<String, Boolean> stringBooleanTuple = contact.validAndResult();

src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java

@@ -20,7 +20,11 @@ import java.util.Objects;
 public class XyqbSessionContextHolder {
 
     private static final ThreadLocal<SessionStruct> threadSession = new ThreadLocal<>();
-    public static RedisTemplate<String, String> redisTemplate = null;
+    private static RedisTemplate<String, String> redisTemplate = null;
+
+    public static void setRedisTemplate(RedisTemplate<String, String> redisTemplate){
+        XyqbSessionContextHolder.redisTemplate = redisTemplate;
+    }
 
     public static SessionStruct getXSession() {
         SessionStruct sessionStruct;