From 6cfff55d44314e88fefd6e3adb290ec16b303f89 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期五, 05 一月 2024 10:42:53 +0800
Subject: [PATCH] 1、供产品导数据临时用(用户，机构，部门，仓库，库管员 可删) 2、选择库管员增加过滤参数

---
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java |  943 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 526 insertions(+), 417 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 868cd29..ea2e9ab 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -1,7 +1,6 @@
 package com.consum.base.controller;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -12,35 +11,41 @@
 import java.util.Optional;
 import java.util.Set;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelDataConvertException;
 import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
 import com.consum.base.pojo.FinSysTenantUserSearchParam;
 import com.consum.base.pojo.FinSysTenantUserUpdParam;
 import com.consum.base.pojo.ImportUserParam;
+import com.consum.base.pojo.RolePageParam;
+import com.consum.base.pojo.request.FinSysTenantUserParam;
 import com.consum.base.pojo.response.DepartmentVO;
 import com.consum.base.pojo.response.FinSysTenantUserVO;
 import com.consum.base.pojo.response.FinSysTenantVO;
 import com.consum.base.pojo.response.UserVO;
+import com.consum.base.service.BaseWarehouseManagerService;
 import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantService;
+import com.consum.base.service.FinSysTenantUserService;
 import com.consum.model.po.FinSysTenant;
 import com.consum.model.po.FinSysTenantDepartment;
 import com.consum.model.po.FinSysTenantUser;
@@ -59,8 +64,6 @@
 import com.walker.infrastructure.utils.PhoneNumberUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
-
-import cn.hutool.core.util.ReflectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -74,15 +77,16 @@
 @Api(value = "鏈烘瀯鐢ㄦ埛淇℃伅", tags = "鏈烘瀯鐢ㄦ埛淇℃伅")
 @RestController
 @RequestMapping("/pc/fin/sys/tenant/user")
+@Slf4j
 public class FinSysTenantUserController extends BaseController {
 
     private String roleName;
 
-    private FinSysTenantUserServiceImpl finSysTenantUserService;
+    private FinSysTenantUserService finSysTenantUserService;
 
     private UserServiceImpl userService;
 
-    private FinSysTenantServiceImpl finSysTenantService;
+    private FinSysTenantService finSysTenantService;
 
     private RoleServiceImpl roleService;
 
@@ -90,16 +94,15 @@
     private FinSysTenantDepartmentService finSysTenantDepartmentService;
 
     @Autowired
-    public void setUserService(UserServiceImpl userService) {
-        this.userService = userService;
-    }
+    private BaseWarehouseManagerService baseWarehouseManagerService;
 
     @Autowired
-    public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService,
-        FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
+    public FinSysTenantUserController(FinSysTenantService finSysTenantService,
+        FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService, UserServiceImpl userService) {
         this.finSysTenantUserService = finSysTenantUserService;
         this.finSysTenantService = finSysTenantService;
         this.roleService = roleService;
+        this.userService = userService;
     }
 
     /**
@@ -114,74 +117,18 @@
         CommonUtil.copyProperties(param, param2);
         param = param2;
         if (param.getTenantCode() == 0) {
-            FinSysTenantUser user = new FinSysTenantUser();
-            Long id = this.getCurrentUser().getId();
-            user.setSysUserId(id);
-            List<FinSysTenantUser> select = finSysTenantUserService.select(user);
-            if (select.size() > 0) {
-                param.setTenantCode(new Long(select.get(0).getTenantCode()));
+            String tenantId = this.getSysInfo().getTenantId();
+            FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
+            if (finSysTenant != null) {
+                param.setTenantCode(Long.valueOf(finSysTenant.getCode()));
             }
         }
-        GenericPager<FinSysTenantUser> pager = this.finSysTenantUserService.queryAllPageUser(param);
+        PageUtil<FinSysTenantUserVO> pager = this.finSysTenantUserService.queryAllPageUser(param);
+        for (FinSysTenantUserVO finSysTenantUser : pager.getDatas()) {
+            String tel = finSysTenantUser.getUserPhone() != null
+                ? AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY) : null;
+            finSysTenantUser.setUserPhone(StringUtils.isNotEmpty(tel) ? PhoneNumberUtils.maskMobile(tel) : "");
 
-        List<FinSysTenantUserVO> resultList = Lists.newArrayList();
-        List<FinSysTenantUser> datas = pager.getDatas();
-        if (datas.size() > 0) {
-            for (FinSysTenantUser finSysTenantUser : datas) {
-                FinSysTenantUserVO userVO = new FinSysTenantUserVO();
-                if (finSysTenantUser.getUserPhone() != null) {
-                    // 瑙ｅ瘑骞惰劚鏁�
-                    String tel = null;
-                    try {
-                        tel = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
-                    } catch (Exception e) {
-                        logger.error("瑙ｅ瘑鎵嬫満鍙峰け璐ワ紝鍘熷洜锛�" + e);
-                        tel = null;
-                    }
-                    if (StringUtils.isNotEmpty(tel)) {
-                        finSysTenantUser.setUserPhone(PhoneNumberUtils.maskMobile(tel));
-                    } else {
-                        finSysTenantUser.setUserPhone("");
-                    }
-                } else {
-                    finSysTenantUser.setUserPhone("");
-                }
-
-                // 寰幆鍘绘煡瑙掕壊
-                Long sysUserId = finSysTenantUser.getSysUserId();
-                if (sysUserId != null) {
-                    List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
-                    String roleStr = "";
-                    for (S_role s_role : list) {
-                        roleStr = roleStr + s_role.getRole_name() + "  ";
-                    }
-                    finSysTenantUser.setRoleStr(roleStr);
-                }
-
-                // 寰幆鏌ヨ杩愮淮鍟唅d
-                if (finSysTenantUser.getSupplierId() != null) {
-                    finSysTenantUser.setIsSupplier("鏄�");
-                } else {
-                    finSysTenantUser.setIsSupplier("鍚�");
-                }
-                BeanUtils.copyProperties(finSysTenantUser, userVO);
-                Long sysDeptId = finSysTenantUser.getSysDeptId();
-                FinSysTenantDepartment department = finSysTenantDepartmentService.getById(sysDeptId);
-                if (Objects.nonNull(department)) {
-                    userVO.setSysDeptName(department.getName());
-                }
-                resultList.add(userVO);
-            }
-        }
-
-        try {
-            Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            // fieldDatas.setAccessible(true);
-            // fieldDatas.set(pager, resultList);
-            ReflectUtil.setFieldValue(pager, fieldDatas, resultList);
-
-        } catch (Exception e) {
-            logger.error("鍒嗛〉鍒楄〃鏌ヨ澶辫触锛屽師鍥狅細" + e);
         }
         return ResponseValue.success(pager);
     }
@@ -206,68 +153,313 @@
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue add() {
         FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, formInventoryParam);
-        user = formInventoryParam;
-        if (user == null) {
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, tenantUser);
+
+        if (tenantUser == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
-        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
-            && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+        FinSysTenantUser userCode = finSysTenantUserService.getByUserCode(tenantUser.getUserCode());
+        if (userCode != null) {
             return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
         }
-        if (user.getTenantId() == null || "".equals(user.getTenantId()) || new Integer(user.getTenantId()) == 0) {
+        if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
             return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
         }
-        if (user.getTenantCode() == null || "".equals(user.getTenantCode()) || new Integer(user.getTenantCode()) == 0) {
-            return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
-        }
+
         // 鎻掑叆绯荤粺鐢ㄦ埛
-        user.setId(NumberGenerator.getLongSequenceNumber());
-        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        user.setCreateBy(this.getCurrentUser().getUser_name());
-        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        user.setUpdateBy(this.getCurrentUser().getUser_name());
-        // user.setStatus(1);// 0绂佺敤 1鍚敤
-        user.setIsDelete(0);
-        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
+        buildTenantUser(tenantUser, null);
+        this.finSysTenantUserService.insert(tenantUser);
+
+        // 鎻掑叆骞冲彴鐢ㄦ埛
+        S_user_core userCore = getsUserCore(tenantUser);
+        this.userService.insert(userCore);
+        // 鎻掑叆骞冲彴鏈烘瀯
+        // 灏戣鑹瞚d
+        // 鏈烘瀯id 澶氫釜
+        List<Long> roleList = user.getRoleList();
+        if (!CollectionUtils.isEmpty(roleList)) {
+            // 鐢ㄦ埛id
+            Long sysUserId = tenantUser.getSysUserId();
+            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
+        }
+        // this.getFinCustomerCache().remove();
+        return ResponseValue.success(1);
+    }
+
+    // 渚涗骇鍝佸鏁版嵁涓存椂鐢�(鍙垹)
+    public ResponseValue add1(FinSysTenantUser user) {
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, tenantUser);
+
+        if (tenantUser == null) {
+            return ResponseValue.error("鍙傛暟涓虹┖");
+        }
+        // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
+        FinSysTenantUser userCode = finSysTenantUserService.getByUserCode(tenantUser.getUserCode());
+        if (userCode != null) {
+            return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
+        }
+        if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
+            return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
+        }
+
+        // 鎻掑叆绯荤粺鐢ㄦ埛
+        buildTenantUser(tenantUser, null);
+        this.finSysTenantUserService.insert(tenantUser);
+
+        // 鎻掑叆骞冲彴鐢ㄦ埛
+        S_user_core userCore = getsUserCore(tenantUser);
+        this.userService.insert(userCore);
+        // 鎻掑叆骞冲彴鏈烘瀯
+        // 灏戣鑹瞚d
+        // 鏈烘瀯id 澶氫釜
+        List<Long> roleList = user.getRoleList();
+        if (!CollectionUtils.isEmpty(roleList)) {
+            // 鐢ㄦ埛id
+            Long sysUserId = tenantUser.getSysUserId();
+            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
+        }
+        // this.getFinCustomerCache().remove();
+        return ResponseValue.success(1);
+    }
+
+    // 瀵兼暟鎹复鏃�(鍙垹)
+    //@GetMapping("/sx")
+    public String sx() {
+        List<Map<String, Object>> selLi = new ArrayList<>();
+        // 鐪佸垎鍏徃
+        String jsonObjq = "[{\"jg\":\"鐪佸叕鍙告笭閬撳钩鍙伴儴\",\"bm\":\"鐪佸叕鍙告笭閬撳钩鍙伴儴\",\"name\":\"鍒樼孩鑿奬",\"sex\":\"濂砛",\"userCode\":\"03552178\",\"phone\":18737105228,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙搁噾铻嶄笟鍔￠儴\",\"bm\":\"鐪佸叕鍙搁噾铻嶄笟鍔￠儴\",\"name\":\"鍒樻捣闇瀄",\"sex\":\"濂砛",\"userCode\":\"01505065\",\"phone\":13523087226,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙稿競鍦鸿惀閿�閮╘",\"bm\":\"鐪佸叕鍙稿競鍦鸿惀閿�閮╘",\"name\":\"寮犵孩褰琝",\"sex\":\"鐢穃",\"userCode\":\"03361744\",\"phone\":15803876096,\"isOk\":\"鍚"},{\"jg\":\"娌冲崡鐪佸垎鍏徃\",\"bm\":\"鐪佸叕鍙稿姙鍏\",\"name\":\"椹尟鏁廫",\"sex\":\"鐢穃",\"userCode\":\"01502670\",\"phone\":13903710700,\"isOk\":\"鏄痋"},{\"jg\":\"娌冲崡鐪佸垎鍏徃\",\"bm\":\"鐪佸叕鍙稿姙鍏\",\"name\":\"钁ｅ穽\",\"sex\":\"鐢穃",\"userCode\":\"04046134\",\"phone\":15837923999,\"isOk\":\"鏄痋"},{\"jg\":\"娌冲崡鐪佸浗闄呬笟鍔″垎鍏徃\",\"bm\":\"杩愯惀閮╘",\"name\":\"宕斿畨鏍揬",\"sex\":\"鐢穃",\"userCode\":\"04062648\",\"phone\":13383711855,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙镐紒涓氬彂灞曚笌绉戞妧閮╘",\"bm\":\"鐪佸垎鍏徃浼佷笟鍙戝睍涓庣鎶�閮╘",\"name\":\"鐗т簯榫橽",\"sex\":\"鐢穃",\"userCode\":\"03994216\",\"phone\":18239947091,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙稿瘎閫掍簨涓氶儴\",\"bm\":\"蹇�掑寘瑁归儴\",\"name\":\"鏉庝匠鎬",\"sex\":\"濂砛",\"userCode\":\"04099973\",\"phone\":18503806796,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙镐笓涓氬叕鍙竆",\"bm\":\"鐪佺墿娴佷笟鍔″垎鍏徃\",\"name\":\"璧靛啗娴‐",\"sex\":\"鐢穃",\"userCode\":\"03823583\",\"phone\":18695817002,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙歌繍钀ョ鐞嗛儴\",\"bm\":\"鐪佸叕鍙歌繍钀ョ鐞嗛儴\",\"name\":\"鍚撮箯\",\"sex\":\"鐢穃",\"userCode\":\"03830501\",\"phone\":18703649829,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙稿璁￠儴\",\"bm\":\"鐪佸叕鍙稿璁￠儴\",\"name\":\"鍚存槬鏅揬",\"sex\":\"濂砛",\"userCode\":\"03687276\",\"phone\":15224998605,\"isOk\":\"鍚"},{\"jg\":\"鐪佸煿璁腑蹇僜",\"bm\":\"鐪佸煿璁腑蹇僜",\"name\":\"寰愮孩鑾塡",\"sex\":\"濂砛",\"userCode\":\"01500210\",\"phone\":18603712875,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙稿璁￠儴\",\"bm\":\"鐪佸叕鍙稿璁￠儴\",\"name\":\"寮犳収\",\"sex\":\"濂砛",\"userCode\":\"01503158\",\"phone\":13939066027,\"isOk\":\"鍚"},{\"jg\":\"鍏氬鍏氬缓宸ヤ綔閮╘",\"bm\":\"鍏氬鍏氬缓宸ヤ綔閮╘",\"name\":\"璧甸懌\",\"sex\":\"鐢穃",\"userCode\":\"01500027\",\"phone\":18603850005,\"isOk\":\"鍚"},{\"jg\":\"鐪佹姤鍒婂彂琛屼腑蹇僜",\"bm\":\"闆跺敭涓氬姟瀹",\"name\":\"鍚曡壋楣",\"sex\":\"濂砛",\"userCode\":\"01504870\",\"phone\":15936222211,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙告湇鍔¤川閲忛儴\",\"bm\":\"鐪佸叕鍙告湇鍔¤川閲忛儴\",\"name\":\"鐜嬪▉\",\"sex\":\"濂砛",\"userCode\":\"03890426\",\"phone\":18637467979,\"isOk\":\"鍚"},{\"jg\":\"鐪侀偖鏀垮伐浼歕",\"bm\":\"鐪侀偖鏀垮伐浼歕",\"name\":\"鏉庢湞瀹嘰",\"sex\":\"鐢穃",\"userCode\":\"03425375\",\"phone\":13676970007,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙搁泦閭笌鏂囧寲浼犲獟閮╘",\"bm\":\"鐪佸叕鍙搁泦閭笌鏂囧寲浼犲獟閮╘",\"name\":\"瀛欑繑\",\"sex\":\"鐢穃",\"userCode\":\"01504413\",\"phone\":18236911185,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙稿畨鍏ㄤ繚鍗儴\",\"bm\":\"鐪佸叕鍙稿畨鍏ㄤ繚鍗儴\",\"name\":\"閮檽鑱僜",\"sex\":\"鐢穃",\"userCode\":\"03215667\",\"phone\":13526691093,\"isOk\":\"鍚"},{\"jg\":\"鐪佸叕鍙稿畨鍏ㄤ繚鍗儴\",\"bm\":\"鐪佸叕鍙稿畨鍏ㄤ繚鍗儴\",\"name\":\"寰愯緣\",\"sex\":\"鐢穃",\"userCode\":\"03563970\",\"phone\":13613837861,\"isOk\":\"鏄痋"},{\"jg\":\"娌冲崡鐪佹満瑕侀�氫俊灞�\",\"bm\":\"閫氫俊瀹",\"name\":\"绋嬭緣\",\"sex\":\"鐢穃",\"userCode\":\"03223176\",\"phone\":13937163121,\"isOk\":\"鏄痋"},{\"jg\":\"鐪佸叕鍙哥邯濮斿姙\",\"bm\":\"鐪佸叕鍙哥邯濮斿姙\",\"name\":\"鐧介暱閿怽",\"sex\":\"濂砛",\"userCode\":\"01504608\",\"phone\":15936205391,\"isOk\":\"\"}]";
+        Long dqq = 100L;
+        Map<String, Object> dqMap = new HashMap<>();
+        dqMap.put("dq", dqq);
+        dqMap.put("jsonObj", jsonObjq);
+        selLi.add(dqMap);
+        // 娲涢槼
+        String jsonObjLy = "[{\"jg\":\"娲涢槼甯傚垎鍏徃\",\"bm\":\"甯傚垎鍏徃鍔炲叕瀹",\"name\":\"寮犲啺\",\"sex\":\"鐢穃",\"userCode\":\"03759601\",\"phone\":13937928371,\"isOk\":\"鏄痋"},{\"jg\":\"娲涢槼甯傚垎鍏徃\",\"bm\":\"甯傚垎鍏徃鍔炲叕瀹",\"name\":\"浠昏繙鑼筡",\"sex\":\"濂砛",\"userCode\":\"03674597\",\"phone\":15896551283,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃璐㈠姟閮╘",\"bm\":\"甯傚垎鍏徃璐㈠姟閮╘",\"name\":\"寮犻拪鐑絓",\"sex\":\"鐢穃",\"userCode\":\"04034306\",\"phone\":18039580366,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍏氬鍏氬缓宸ヤ綔閮╘",\"bm\":\"甯傚垎鍏徃鍏氬鍏氬缓宸ヤ綔閮╘",\"name\":\"瀛ｆ尟鍒‐",\"sex\":\"鐢穃",\"userCode\":\"01510981\",\"phone\":13939933919,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃绾鍔炲叕瀹",\"bm\":\"甯傚垎鍏徃绾鍔炲叕瀹",\"name\":\"鍒橀潤\",\"sex\":\"濂砛",\"userCode\":\"03683369\",\"phone\":18103884255,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"bm\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"name\":\"閮捣钃塡",\"sex\":\"濂砛",\"userCode\":\"01510011\",\"phone\":13903880036,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃閭斂宸ヤ細\",\"bm\":\"甯傚垎鍏徃閭斂宸ヤ細\",\"name\":\"娌堥洴绔",\"sex\":\"濂砛",\"userCode\":\"04151632\",\"phone\":13838866710,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"bm\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"name\":\"寮犵惓\",\"sex\":\"濂砛",\"userCode\":\"03361080\",\"phone\":15138789615,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"name\":\"鏉庢潹\",\"sex\":\"濂砛",\"userCode\":\"01511005\",\"phone\":13403798177,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"bm\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"name\":\"鐜嬮敗楣廫",\"sex\":\"鐢穃",\"userCode\":\"01510959\",\"phone\":13803791652,\"isOk\":\"鍚"},{\"jg\":\"鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"鏈鸿閫氫俊鍒嗗眬\",\"name\":\"鐜嬫柊濂嘰",\"sex\":\"鐢穃",\"userCode\":\"03696444\",\"phone\":15937960867,\"isOk\":\"鍚"},{\"jg\":\"涓夌骇鐗╂祦浣撶郴寤鸿宸ヤ綔涓撶彮\",\"bm\":\"涓夌骇鐗╂祦浣撶郴寤鸿宸ヤ綔涓撶彮\",\"name\":\"鏉庡\",\"sex\":\"鐢穃",\"userCode\":\"03773656\",\"phone\":18637973399,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"bm\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"name\":\"姝︿附濞焅",\"sex\":\"濂砛",\"userCode\":\"01510731\",\"phone\":13938860508,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"bm\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"name\":\"鑰胯緣\",\"sex\":\"濂砛",\"userCode\":\"01510263\",\"phone\":18503791195,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃闆嗛偖鏂囧寲浼犲獟閮╘",\"bm\":\"甯傚垎鍏徃闆嗛偖鏂囧寲浼犲獟閮╘",\"name\":\"鐜嬫搸鍗嶾",\"sex\":\"濂砛",\"userCode\":\"01510701\",\"phone\":13837906227,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"bm\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"name\":\"鐜嬭悓\",\"sex\":\"鐢穃",\"userCode\":\"01510278\",\"phone\":13849927054,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"bm\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"name\":\"寮犵憸\",\"sex\":\"濂砛",\"userCode\":\"03388290\",\"phone\":13303797187,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍥介檯閮╘",\"bm\":\"甯傚垎鍏徃鍥介檯閮╘",\"name\":\"琚佹ⅵ娉絓",\"sex\":\"濂砛",\"userCode\":\"04018427\",\"phone\":13837570555,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃蹇寘閮╘",\"bm\":\"甯傚垎鍏徃蹇寘閮╘",\"name\":\"妯婁紵鐠焅",\"sex\":\"濂砛",\"userCode\":\"01510617\",\"phone\":13938823944,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏍囧揩閮╘",\"bm\":\"甯傚垎鍏徃鏍囧揩閮╘",\"name\":\"鐢冲皬鑺砛",\"sex\":\"濂砛",\"userCode\":\"03291311\",\"phone\":13693802105,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鐗╂祦閮╘",\"bm\":\"甯傚垎鍏徃鐗╂祦閮╘",\"name\":\"姝﹀皬濞焅",\"sex\":\"濂砛",\"userCode\":\"01510277\",\"phone\":13783100717,\"isOk\":\"鍚"},{\"jg\":\"娲涢槼甯傝タ宸ュ尯鍒嗗叕鍙竆",\"bm\":\"瑗垮伐鍖哄垎鍏徃\",\"name\":\"鐜嬪嘲\",\"sex\":\"鐢穃",\"userCode\":\"03222623\",\"phone\":15637917771,\"isOk\":\"鏄痋"},{\"jg\":\"娲涢槼甯傝�佸煄鍖虹�嶆渤鍖哄垎鍏徃\",\"bm\":\"鐎嶆渤鍖哄垎鍏徃\",\"name\":\"灏ゆ槑杈塡",\"sex\":\"濂砛",\"userCode\":\"01511182\",\"phone\":13698807787,\"isOk\":\"鏄痋"},{\"jg\":\"娲涢槼甯傛锭瑗垮尯鍒嗗叕鍙竆",\"bm\":\"娑цタ鍖哄垎鍏徃\",\"name\":\"浠樻檽涓絓",\"sex\":\"濂砛",\"userCode\":\"01515181\",\"phone\":13838410612,\"isOk\":\"鏄痋"},{\"jg\":\"娲涢槼甯傛礇榫欏尯鍒嗗叕鍙竆",\"bm\":\"娲涢緳鍖哄垎鍏徃\",\"name\":\"濮柊涔怽",\"sex\":\"鐢穃",\"userCode\":\"03207269\",\"phone\":13707690099,\"isOk\":\"鏄痋"},{\"jg\":\"娲涢槼甯傚悏鍒╁尯鍒嗗叕鍙竆",\"bm\":\"鍚夊埄鍖哄垎鍏徃\",\"name\":\"浜庨暱鍐沑",\"sex\":\"鐢穃",\"userCode\":\"01511215\",\"phone\":13700796606,\"isOk\":\"鏄痋"},{\"jg\":\"鍋冨笀甯傚垎鍏徃\",\"bm\":\"鍋冨笀甯傚垎鍏徃\",\"name\":\"涔斾簹鍧",\"sex\":\"鐢穃",\"userCode\":\"03928890\",\"phone\":18838811901,\"isOk\":\"鏄痋"},{\"jg\":\"瀛熸触鍘垮垎鍏徃\",\"bm\":\"瀛熸触鍘垮垎鍏徃\",\"name\":\"瀹嬩簹鍐沑",\"sex\":\"鐢穃",\"userCode\":\"01511776\",\"phone\":18937979877,\"isOk\":\"鏄痋"},{\"jg\":\"鏂板畨鍘垮垎鍏徃\",\"bm\":\"鏂板畨鍘垮垎鍏徃\",\"name\":\"鏌充笘寮篭",\"sex\":\"鐢穃",\"userCode\":\"01511988\",\"phone\":13837903567,\"isOk\":\"鏄痋"},{\"jg\":\"浼婂窛鍘垮垎鍏徃\",\"bm\":\"浼婂窛鍘垮垎鍏徃\",\"name\":\"鐜嬬伩鏈漒",\"sex\":\"鐢穃",\"userCode\":\"01512126\",\"phone\":13633888158,\"isOk\":\"鏄痋"},{\"jg\":\"姹濋槼鍘垮垎鍏徃\",\"bm\":\"姹濋槼鍘垮垎鍏徃\",\"name\":\"榛勪簹鏌痋",\"sex\":\"鐢穃",\"userCode\":\"03469514\",\"phone\":15896509000,\"isOk\":\"鏄痋"},{\"jg\":\"宓╁幙鍒嗗叕鍙竆",\"bm\":\"宓╁幙鍒嗗叕鍙竆",\"name\":\"寮犺敁\",\"sex\":\"濂砛",\"userCode\":\"01512531\",\"phone\":13461096641,\"isOk\":\"鏄痋"},{\"jg\":\"娲涘畞鍘垮垎鍏徃\",\"bm\":\"娲涘畞鍘垮垎鍏徃\",\"name\":\"寮犵孩浼焅",\"sex\":\"鐢穃",\"userCode\":\"01512666\",\"phone\":\"13608463677\",\"isOk\":\"鏄痋"},{\"jg\":\"鏍惧窛鍘垮垎鍏徃\",\"bm\":\"鏍惧窛鍘垮垎鍏徃\",\"name\":\"浠绘眽鏅揬",\"sex\":\"鐢穃",\"userCode\":\"01513030\",\"phone\":13213643888,\"isOk\":\"鏄痋"},{\"jg\":\"瀹滈槼鍘垮垎鍏徃\",\"bm\":\"瀹滈槼鍘垮垎鍏徃\",\"name\":\"灏瑰彫閿媆",\"sex\":\"鐢穃",\"userCode\":\"01513087\",\"phone\":13598159606,\"isOk\":\"鏄痋"}]";
+        Long dqLy = 100003L;
+        Map<String, Object> dqMapLy = new HashMap<>();
+        dqMapLy.put("dq", dqLy);
+        dqMapLy.put("jsonObj", jsonObjLy);
+        selLi.add(dqMapLy);
+
+        // 鏂颁埂
+        String jsonObjXx = "[{\"jg\":\"鏂颁埂甯傜孩鏃楀尯鍒嗗叕鍙竆",\"bm\":\"绾㈡棗鍖哄垎鍏徃\",\"name\":\"浣曡秴\",\"sex\":\"鐢穃",\"userCode\":\"03210567\",\"phone\":15537301123,\"isOk\":\"鏄痋"},{\"jg\":\"鏂颁埂甯傚崼婊ㄥ尯鍒嗗叕鍙竆",\"bm\":\"鍗花鍖哄垎鍏徃\",\"name\":\"娲壓鍑孿",\"sex\":\"濂砛",\"userCode\":\"04228999\",\"phone\":13193529810,\"isOk\":\"鏄痋"},{\"jg\":\"鏂颁埂鍘垮垎鍏徃\",\"bm\":\"鏂颁埂鍘垮垎鍏徃\",\"name\":\"鐜嬬強\",\"sex\":\"濂砛",\"userCode\":\"01520346\",\"phone\":18503738081,\"isOk\":\"鏄痋"},{\"jg\":\"鍗緣甯傚垎鍏徃\",\"bm\":\"鍗緣甯傚垎鍏徃\",\"name\":\"鏉庡箍楣廫",\"sex\":\"鐢穃",\"userCode\":\"03301600\",\"phone\":13803805869,\"isOk\":\"鏄痋"},{\"jg\":\"闀垮灒鍘垮垎鍏徃\",\"bm\":\"闀垮灒鍘垮垎鍏徃\",\"name\":\"鐗涜儨娉",\"sex\":\"鐢穃",\"userCode\":\"03899135\",\"phone\":18790652979,\"isOk\":\"鏄痋"},{\"jg\":\"鑾峰槈鍘垮垎鍏徃\",\"bm\":\"鑾峰槈鍘垮垎鍏徃\",\"name\":\"鍒樼礌绾",\"sex\":\"濂砛",\"userCode\":\"01521199\",\"phone\":13937334224,\"isOk\":\"鏄痋"},{\"jg\":\"杈夊幙甯傚垎鍏徃\",\"bm\":\"杈夊幙甯傚垎鍏徃\",\"name\":\"鐢虫柊鍑痋",\"sex\":\"鐢穃",\"userCode\":\"01521360\",\"phone\":18537330511,\"isOk\":\"鏄痋"},{\"jg\":\"鍘熼槼鍘垮垎鍏徃\",\"bm\":\"鍘熼槼鍘垮垎鍏徃\",\"name\":\"鍒樿秴\",\"sex\":\"鐢穃",\"userCode\":\"01521730\",\"phone\":13707650123,\"isOk\":\"鏄痋"},{\"jg\":\"寤舵触鍘垮垎鍏徃\",\"bm\":\"寤舵触鍘垮垎鍏徃\",\"name\":\"寮犻湶\",\"sex\":\"濂砛",\"userCode\":\"01522001\",\"phone\":13937370037,\"isOk\":\"鏄痋"},{\"jg\":\"灏佷笜鍘垮垎鍏徃\",\"bm\":\"灏佷笜鍘垮垎鍏徃\",\"name\":\"澶忕淮楂榎",\"sex\":\"鐢穃",\"userCode\":\"04075391\",\"phone\":15136797778,\"isOk\":\"鏄痋"},{\"jg\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"bm\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"name\":\"寮犳潐鏉塡",\"sex\":\"濂砛",\"userCode\":\"03826195\",\"phone\":15937377509,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"bm\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"name\":\"寮犻┌\",\"sex\":\"鐢穃",\"userCode\":\"04176306\",\"phone\":13598636235,\"isOk\":\"鍚"},{\"jg\":\"鏂颁埂甯傚垎鍏徃\",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"鏉滃崥鏂嘰",\"sex\":\"鐢穃",\"userCode\":\"03823498\",\"phone\":15637388663,\"isOk\":\"鏄痋"},{\"jg\":\"鏂颁埂甯傚垎鍏徃\",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"鐜嬫槅\",\"sex\":\"鐢穃",\"userCode\":\"03302561\",\"phone\":13525080106,\"isOk\":\"鍚"},{\"jg\":\"鏂颁埂甯傚垎鍏徃\",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"鏉庡博\",\"sex\":\"濂砛",\"userCode\":\"01519703\",\"phone\":15837361011,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃绾鍔瀄",\"bm\":\"甯傚垎鍏徃绾鍔瀄",\"name\":\"鍚寸惓鐞砛",\"sex\":\"濂砛",\"userCode\":\"03204711\",\"phone\":13462330456,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍏氬缓宸ヤ綔閮╘",\"bm\":\"甯傚垎鍏徃鍏氬缓宸ヤ綔閮╘",\"name\":\"钖涚帀濠穃",\"sex\":\"濂砛",\"userCode\":\"03364895\",\"phone\":18503738050,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"bm\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"name\":\"闄堟檽鑸猏",\"sex\":\"鐢穃",\"userCode\":\"04034140\",\"phone\":13525071200,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"bm\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"name\":\"璐归\",\"sex\":\"濂砛",\"userCode\":\"04034097\",\"phone\":15036606066,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"bm\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"name\":\"濞勬捣娑沑",\"sex\":\"鐢穃",\"userCode\":\"01519606\",\"phone\":15836171777,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"bm\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"name\":\"璐剧惇\",\"sex\":\"濂砛",\"userCode\":\"03363899\",\"phone\":18237396886,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"鏉ㄦ晱\",\"sex\":\"濂砛",\"userCode\":\"01521917\",\"phone\":13782581260,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"鍛ㄦ柊鏂癨",\"sex\":\"濂砛",\"userCode\":\"01519517\",\"phone\":13781959890,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"name\":\"閮崕\",\"sex\":\"濂砛",\"userCode\":\"01520280\",\"phone\":13782571861,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"甯傚垎鍏徃鏈鸿閫氫俊鍒嗗眬\",\"name\":\"鍘熷ぇ浼焅",\"sex\":\"鐢穃",\"userCode\":\"01519161\",\"phone\":18637398236,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃宸ヤ細\",\"bm\":\"甯傚垎鍏徃宸ヤ細\",\"name\":\"闊╅\",\"sex\":\"鐢穃",\"userCode\":\"01520297\",\"phone\":\"13462349483\",\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"bm\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"name\":\"鍛ㄦ枃鍒歕",\"sex\":\"鐢穃",\"userCode\":\"03364889\",\"phone\":15993017558,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鐗╂祦璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鐗╂祦璐ｄ换涓績\",\"name\":\"鍒樼\",\"sex\":\"濂砛",\"userCode\":\"01519734\",\"phone\":13462202288,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏍囧揩璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鏍囧揩璐ｄ换涓績\",\"name\":\"绁佺伩姊梊",\"sex\":\"濂砛",\"userCode\":\"03448285\",\"phone\":18625956096,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍥介檯璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鍥介檯璐ｄ换涓績\",\"name\":\"闄堟絿\",\"sex\":\"濂砛",\"userCode\":\"04099763\",\"phone\":15660143332,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃璐㈠姟閮╘",\"bm\":\"甯傚垎鍏徃璐㈠姟閮╘",\"name\":\"瀹嬫磥\",\"sex\":\"濂砛",\"userCode\":\"03359178\",\"phone\":13663732775,\"isOk\":\"鍚"}]";
+        Long dqXx = 100007L;
+        Map<String, Object> dqMapXx = new HashMap<>();
+        dqMapXx.put("dq", dqXx);
+        dqMapXx.put("jsonObj", jsonObjXx);
+        selLi.add(dqMapXx);
+
+        // 鐒︿綔
+        String jsonObjJz = "[{\"jg\":\"鐒︿綔甯傚垎鍏徃\",\"bm\":\"甯傚叕鍙稿姙鍏\",\"name\":\"琚佹槑\",\"sex\":\"鐢穃",\"userCode\":\"01522429\",\"phone\":13938160410,\"isOk\":\"鏄痋"},{\"jg\":\"璐㈠姟閮╘",\"bm\":\"璐㈠姟閮╘",\"name\":\"鏉庣堪鏋梊",\"sex\":\"鐢穃",\"userCode\":\"04104297\",\"phone\":17638919096,\"isOk\":\"鍚"},{\"jg\":\"浜哄姏璧勬簮閮╘",\"bm\":\"浜哄姏璧勬簮閮╘",\"name\":\"璧电憺鏄孿",\"sex\":\"鐢穃",\"userCode\":\"01522936\",\"phone\":13939198378,\"isOk\":\"鍚"},{\"jg\":\"鍏氬缓宸ヤ綔閮╘",\"bm\":\"鍏氬缓宸ヤ綔閮╘",\"name\":\"甯歌壋\",\"sex\":\"濂砛",\"userCode\":\"01522695\",\"phone\":15993797171,\"isOk\":\"鍚"},{\"jg\":\"宸ヤ細\",\"bm\":\"宸ヤ細\",\"name\":\"鐜嬫弧涓璡",\"sex\":\"鐢穃",\"userCode\":\"01522496\",\"phone\":13938159133,\"isOk\":\"鍚"},{\"jg\":\"甯傚満钀ラ攢閮╘",\"bm\":\"甯傚満钀ラ攢閮╘",\"name\":\"閮┃鑿瞈",\"sex\":\"濂砛",\"userCode\":\"03886838\",\"phone\":18300601166,\"isOk\":\"鍚"},{\"jg\":\"鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"鏈嶅姟璐ㄩ噺閮╘",\"name\":\"浠濆崼寮篭",\"sex\":\"鐢穃",\"userCode\":\"01522937\",\"phone\":18236859609,\"isOk\":\"鍚"},{\"jg\":\"杩愯惀绠＄悊閮╘",\"bm\":\"杩愯惀绠＄悊閮╘",\"name\":\"渚帀濠穃",\"sex\":\"濂砛",\"userCode\":\"04035146\",\"phone\":15639177955,\"isOk\":\"鍚"},{\"jg\":\"缃戣矾杩愯惀涓績\",\"bm\":\"缃戣矾杩愯惀涓績\",\"name\":\"钄＄\",\"sex\":\"鐢穃",\"userCode\":\"03481688\",\"phone\":18603916101,\"isOk\":\"鍚"},{\"jg\":\"涓夌骇鐗╂祦浣撶郴寤鸿涓揬",\"bm\":\"涓夌骇鐗╂祦浣撶郴寤鸿涓撶彮\",\"name\":\"闊﹀缓鐞哱",\"sex\":\"鐢穃",\"userCode\":\"01522952\\n\",\"phone\":\"15978781080\\n\",\"isOk\":\"鍚"},{\"jg\":\"閲戣瀺涓氬姟閮╘",\"bm\":\"閲戣瀺涓氬姟閮╘",\"name\":\"鏉庡噷蹇梊",\"sex\":\"鐢穃",\"userCode\":\"04104055\",\"phone\":15539128318,\"isOk\":\"鍚"},{\"jg\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"鏉ㄦ捣鑹砛",\"sex\":\"濂砛",\"userCode\":\"01523490\",\"phone\":13939190999,\"isOk\":\"鍚"},{\"jg\":\"娓犻亾骞冲彴閮╘",\"bm\":\"娓犻亾骞冲彴閮╘",\"name\":\"娈垫槅鏄嶾",\"sex\":\"鐢穃",\"userCode\":\"01522588\",\"phone\":13938193778,\"isOk\":\"鍚"},{\"jg\":\"鍥介檯鐗╂祦涓撲笟璐ｄ换涓績\",\"bm\":\"鍥介檯鐗╂祦涓撲笟璐ｄ换涓績\",\"name\":\"鍒樼孩鐞碶",\"sex\":\"濂砛",\"userCode\":\"01523196 \",\"phone\":13598509735,\"isOk\":\"鍚"},{\"jg\":\"蹇�掑寘瑁逛笓涓氳矗浠讳腑蹇僜",\"bm\":\"蹇�掑寘瑁逛笓涓氳矗浠讳腑蹇僜",\"name\":\"閮藉皬涓絓",\"sex\":\"濂砛",\"userCode\":\"03252380\",\"phone\":13723199928,\"isOk\":\"鍚"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"name\":\"闄堟弧蹇僜",\"sex\":\"濂砛",\"userCode\":\"03335415\",\"phone\":13639624533,\"isOk\":\"鏄痋"},{\"jg\":\"鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"鏈鸿閫氫俊鍒嗗眬\",\"name\":\"寮犻瓘寮篭",\"sex\":\"鐢穃",\"userCode\":\"01522560\",\"phone\":13803919688,\"isOk\":\"鏄痋"},{\"jg\":\"瑙ｆ斁鍖哄垎鍏徃\",\"bm\":\"瑙ｆ斁鍖哄垎鍏徃\",\"name\":\"鏉庢晱鏉癨",\"sex\":\"濂砛",\"userCode\":\"01522596\",\"phone\":18236859535,\"isOk\":\"鏄痋"},{\"jg\":\"楂樻柊鍖哄垎鍏徃\",\"bm\":\"楂樻柊鍖哄垎鍏徃\",\"name\":\"鍒樼孩姊匼",\"sex\":\"濂砛",\"userCode\":\"03679240\",\"phone\":15517775737,\"isOk\":\"鏄痋"},{\"jg\":\"淇鍘垮垎鍏徃\",\"bm\":\"淇鍘垮垎鍏徃\",\"name\":\"鎴愯壋闇瀄",\"sex\":\"濂砛",\"userCode\":\"01523336\",\"phone\":13939151863,\"isOk\":\"鍚"},{\"jg\":\"鍗氱埍鍘垮垎鍏徃\",\"bm\":\"鍗氱埍鍘垮垎鍏徃\",\"name\":\"璧垫柊鐢焅",\"sex\":\"鐢穃",\"userCode\":\"01523486\",\"phone\":13839149788,\"isOk\":\"鏄痋"},{\"jg\":\"娌侀槼甯傚垎鍏徃\",\"bm\":\"娌侀槼甯傚垎鍏徃\",\"name\":\"鐜嬫枌\",\"sex\":\"鐢穃",\"userCode\":\"03268284\",\"phone\":13613910732,\"isOk\":\"鍚"},{\"jg\":\"瀛熷窞甯傚垎鍏徃\",\"bm\":\"瀛熷窞甯傚垎鍏徃\",\"name\":\"鐢板畨蹇燶",\"sex\":\"鐢穃",\"userCode\":\"03772928\",\"phone\":13938152349,\"isOk\":\"鏄痋"},{\"jg\":\"娓╁幙鍒嗗叕鍙竆",\"bm\":\"娓╁幙鍒嗗叕鍙竆",\"name\":\"寮犲崰鍐沑",\"sex\":\"鐢穃",\"userCode\":\"01524134\",\"phone\":13839122000,\"isOk\":\"鏄痋"},{\"jg\":\"姝﹂櫉鍘垮垎鍏徃\",\"bm\":\"姝﹂櫉鍘垮垎鍏徃\",\"name\":\"瀛欐枃鍐沑",\"sex\":\"鐢穃",\"userCode\":\"03569319\",\"phone\":15939199904,\"isOk\":\"鍚"}]";
+        Long dqJz = 100008L;
+        Map<String, Object> dqMapJz = new HashMap<>();
+        dqMapJz.put("dq", dqJz);
+        dqMapJz.put("jsonObj", jsonObjJz);
+        selLi.add(dqMapJz);
+
+        // 鍟嗕笜
+        String jsonObjSq = "[{\"jg\":\"鍟嗕笜甯傚尯鍒嗗叕鍙竆",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"瀹嬩咕\",\"sex\":\"濂砛",\"userCode\":\"01530524\",\"phone\":13673708862,\"isOk\":\"鍚"},{\"jg\":\"鍟嗕笜甯傚尯鍒嗗叕鍙竆",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"寮犲姴鏉綷",\"sex\":\"鐢穃",\"userCode\":\"01531091\",\"phone\":13462901736,\"isOk\":\"鏄痋"},{\"jg\":\"鍟嗕笜甯傚尯鍒嗗叕鍙竆",\"bm\":\"甯傚垎鍏徃缁煎悎鍔瀄",\"name\":\"浠诲疂鐝峔",\"sex\":\"濂砛",\"userCode\":\"01530908\",\"phone\":15937069188,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃璐㈠姟閮╘",\"bm\":\"甯傚垎鍏徃璐㈠姟閮╘",\"name\":\"寮犵帀鏌盶",\"sex\":\"鐢穃",\"userCode\":\"03618449\",\"phone\":18137017776,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃浜烘暀閮╘",\"bm\":\"甯傚垎鍏徃浜烘暀閮╘",\"name\":\"寮犳檽鑹砛",\"sex\":\"濂砛",\"userCode\":\"03210927\",\"phone\":13781631208,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃甯傚満閮╘",\"bm\":\"甯傚垎鍏徃甯傚満閮╘",\"name\":\"鑼冩ⅵ鏌痋",\"sex\":\"鐢穃",\"userCode\":\"04104148\",\"phone\":18737037775,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺\",\"bm\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"name\":\"鍚曞崜鍏碶",\"sex\":\"鐢穃",\"userCode\":\"03931926\",\"phone\":18637077718,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"bm\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"name\":\"鑼冭繍鍏碶",\"sex\":\"鐢穃",\"userCode\":\"03271626\",\"phone\":15836857001,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃闆嗛偖涓庣淮鎶や紶濯掗儴\",\"bm\":\"甯傚垎鍏徃闆嗛偖涓庣淮鎶や紶濯掗儴\",\"name\":\"宕斾功寮篭",\"sex\":\"鐢穃",\"userCode\":\"01530899\",\"phone\":13603709601,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"bm\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"name\":\"鐜嬭寽\",\"sex\":\"濂砛",\"userCode\":\"01530920\",\"phone\":15236862588,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈鸿灞�\",\"bm\":\"甯傚垎鍏徃鏈鸿灞�\",\"name\":\"鍛ㄥ己\",\"sex\":\"鐢穃",\"userCode\":\"03347143\",\"phone\":13526329955,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"bm\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"name\":\"璺姃闃砛",\"sex\":\"濂砛",\"userCode\":\"03446939\",\"phone\":15303704567,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃蹇�掑寘瑁归儴\",\"bm\":\"甯傚垎鍏徃蹇�掑寘瑁归儴\",\"name\":\"绋嬫浖\",\"sex\":\"濂砛",\"userCode\":\"03250233\",\"phone\":19139055879,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏍囧噯蹇�掗儴\",\"bm\":\"甯傚垎鍏徃鏍囧噯蹇�掗儴\",\"name\":\"璧靛啝瀹嘰",\"sex\":\"鐢穃",\"userCode\":\"03383431\",\"phone\":18503700905,\"isOk\":\"鍚"},{\"jg\":\"甯傚尯鍒嗗叕鍙竆",\"bm\":\"甯傚尯鍒嗗叕鍙竆",\"name\":\"鏈卞竻\",\"sex\":\"鐢穃",\"userCode\":\"01530863\",\"phone\":13037534321,\"isOk\":\"鏄痋"},{\"jg\":\"姘稿煄甯傚垎鍏徃\",\"bm\":\"姘稿煄甯傚垎鍏徃\",\"name\":\"鍚撮湝\",\"sex\":\"鐢穃",\"userCode\":3630201,\"phone\":13781590766,\"isOk\":\"鏄痋"},{\"jg\":\"澶忛倯鍘垮垎鍏徃\",\"bm\":\"澶忛倯鍘垮垎鍏徃\",\"name\":\"鏉庡崜娲媆",\"sex\":\"鐢穃",\"userCode\":\"04222417\",\"phone\":15713610166,\"isOk\":\"鏄痋"},{\"jg\":\"铏炲煄鍘垮垎鍏徃\",\"bm\":\"铏炲煄鍘垮垎鍏徃\",\"name\":\"璐惧郴宄癨",\"sex\":\"鐢穃",\"userCode\":\"03734792\",\"phone\":13271056969,\"isOk\":\"鏄痋"},{\"jg\":\"閮婂尯鍒嗗叕鍙竆",\"bm\":\"閮婂尯鍒嗗叕鍙竆",\"name\":\"鏉庤繙鏉癨",\"sex\":\"鐢穃",\"userCode\":\"04176514\",\"phone\":13526303157,\"isOk\":\"鏄痋"},{\"jg\":\"鏌樺煄鍘垮垎鍏徃\",\"bm\":\"鏌樺煄鍘垮垎鍏徃\",\"name\":\"闊╅亾姘慭",\"sex\":\"鐢穃",\"userCode\":\"01532380\",\"phone\":13781547966,\"isOk\":\"鏄痋"},{\"jg\":\"瀹侀櫟鍘垮垎鍏徃\",\"bm\":\"瀹侀櫟鍘垮垎鍏徃\",\"name\":\"寰愭墠鍗嶾",\"sex\":\"濂砛",\"userCode\":\"01532663\",\"phone\":15993929910,\"isOk\":\"鏄痋"},{\"jg\":\"鐫㈠幙鍒嗗叕鍙竆",\"bm\":\"鐫㈠幙鍒嗗叕鍙竆",\"name\":\"鏋楄寽\",\"sex\":\"濂砛",\"userCode\":\"03818703\",\"phone\":18037095520,\"isOk\":\"鏄痋"},{\"jg\":\"姘戞潈鍘垮垎鍏徃\",\"bm\":\"姘戞潈鍘垮垎鍏徃\",\"name\":\"姣曚笘绁",\"sex\":\"鐢穃",\"userCode\":\"01533025\",\"phone\":18337066569,\"isOk\":\"鏄痋"}]";
+        Long dqSq = 100013L;
+        Map<String, Object> dqMapSq = new HashMap<>();
+        dqMapSq.put("dq", dqSq);
+        dqMapSq.put("jsonObj", jsonObjSq);
+        selLi.add(dqMapSq);
+
+        // 璁告槍
+        String jsonObjXc = "[{\"jg\":\"寤哄崡鍖哄垎鍏徃\",\"bm\":\"寤哄崡鍖哄垎鍏徃\",\"name\":\"榛勮彶鑿瞈",\"sex\":\"濂砛",\"userCode\":\"03554953\",\"phone\":15638785667,\"isOk\":\"鏄痋"},{\"jg\":\"寤哄寳鍖哄垎鍏徃\",\"bm\":\"寤哄寳鍖哄垎鍏徃\",\"name\":\"闄堣幑鑾筡",\"sex\":\"濂砛",\"userCode\":\"03452284\",\"phone\":18864680605,\"isOk\":\"鏄痋"},{\"jg\":\"闀胯憶甯傚垎鍏徃\",\"bm\":\"闀胯憶甯傚垎鍏徃\",\"name\":\"寮犲缓鍐淺",\"sex\":\"鐢穃",\"userCode\":\"01528570\",\"phone\":15136823766,\"isOk\":\"鏄痋"},{\"jg\":\"绂瑰窞甯傚垎鍏徃\",\"bm\":\"绂瑰窞甯傚垎鍏徃\",\"name\":\"璧电户浼焅",\"sex\":\"鐢穃",\"userCode\":\"01528248\",\"phone\":13639666968,\"isOk\":\"鏄痋"},{\"jg\":\"閯㈤櫟鍘垮垎鍏徃\",\"bm\":\"閯㈤櫟鍘垮垎鍏徃\",\"name\":\"椹瘏椋瀄",\"sex\":\"鐢穃",\"userCode\":\"03424227\",\"phone\":13598975685,\"isOk\":\"鏄痋"},{\"jg\":\"寤哄畨鍖哄垎鍏徃\",\"bm\":\"寤哄畨鍖哄垎鍏徃\",\"name\":\"瀹嬩簹\",\"sex\":\"鐢穃",\"userCode\":\"03463083\",\"phone\":15617222699,\"isOk\":\"鏄痋"},{\"jg\":\"瑗勫煄鍘垮垎鍏徃\",\"bm\":\"瑗勫煄鍘垮垎鍏徃\",\"name\":\"涓佷簹濞焅",\"sex\":\"濂砛",\"userCode\":\"01528695\",\"phone\":13409389827,\"isOk\":\"鏄痋"},{\"jg\":\"璁告槍甯傚垎鍏徃\",\"bm\":\"璁告槍甯傚垎鍏徃\",\"name\":\"钁涢\",\"sex\":\"鐢穃",\"userCode\":\"01528228\",\"phone\":15936376880,\"isOk\":\"鏄痋"},{\"jg\":\"甯傚垎鍏徃璐㈠姟閮╘",\"bm\":\"甯傚垎鍏徃璐㈠姟閮╘",\"name\":\"寰愮礌璐瀄",\"sex\":\"濂砛",\"userCode\":\"01528921\",\"phone\":15603743166,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"bm\":\"甯傚垎鍏徃甯傚満钀ラ攢閮╘",\"name\":\"闄堟槬绾",\"sex\":\"濂砛",\"userCode\":\"01527674\",\"phone\":15603899126,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"bm\":\"甯傚垎鍏徃浜哄姏璧勬簮閮╘",\"name\":\"鏇硅緣\",\"sex\":\"鐢穃",\"userCode\":\"03829538\",\"phone\":15503743300,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"甯傚垎鍏徃鏈嶅姟璐ㄩ噺閮╘",\"name\":\"搴风礌鏄嶾",\"sex\":\"鐢穃",\"userCode\":\"01527887\",\"phone\":18837411185,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍏氬缓宸ヤ綔閮╘",\"bm\":\"甯傚垎鍏徃鍏氬缓宸ヤ綔閮╘",\"name\":\"寮犱腹鍗塡",\"sex\":\"濂砛",\"userCode\":\"03829542\",\"phone\":15037446316,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"bm\":\"甯傚垎鍏徃閲戣瀺涓氬姟閮╘",\"name\":\"璧甸\",\"sex\":\"鐢穃",\"userCode\":\"01527748\",\"phone\":18503741197,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"bm\":\"甯傚垎鍏徃娓犻亾骞冲彴閮╘",\"name\":\"闃磋敋妗刓",\"sex\":\"鐢穃",\"userCode\":\"03785422\",\"phone\":18530916215,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"甯傚垎鍏徃闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"楂樻櫒宄癨",\"sex\":\"鐢穃",\"userCode\":\"03167465\",\"phone\":18697378101,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"甯傚垎鍏徃鏈鸿閫氫俊鍒嗗眬\",\"name\":\"寰愬織宄癨",\"sex\":\"鐢穃",\"userCode\":\"01527726\",\"phone\":13598999166,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"bm\":\"甯傚垎鍏徃杩愯惀绠＄悊閮╘",\"name\":\"鑻忔瘏\",\"sex\":\"鐢穃",\"userCode\":\"01527616\",\"phone\":18623809688,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鐗瑰揩璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鐗瑰揩璐ｄ换涓績\",\"name\":\"鐜嬮潤\",\"sex\":\"濂砛",\"userCode\":\"01528057\",\"phone\":15603895177,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃蹇寘璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃蹇寘璐ｄ换涓績\",\"name\":\"宕旀枃濂嶾",\"sex\":\"鐢穃",\"userCode\":\"01527891\",\"phone\":\"187374031113\",\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鍥介檯璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鍥介檯璐ｄ换涓績\",\"name\":\"鐜嬩附涓絓",\"sex\":\"濂砛",\"userCode\":\"03890009\",\"phone\":18737418298,\"isOk\":\"鍚"},{\"jg\":\"甯傚垎鍏徃鐗╂祦璐ｄ换涓績\",\"bm\":\"甯傚垎鍏徃鐗╂祦璐ｄ换涓績\",\"name\":\"绋嬫槦\",\"sex\":\"濂砛",\"userCode\":\"03965374\",\"phone\":15638781678,\"isOk\":\"鍚"}]";
+        Long dqXc = 100010L;
+        Map<String, Object> dqMapXc = new HashMap<>();
+        dqMapXc.put("dq", dqXc);
+        dqMapXc.put("jsonObj", jsonObjXc);
+        selLi.add(dqMapXc);
+
+
+        // 瀹夐槼
+        String jsonObjAy = "[{\"jg\":\"璐㈠姟閮╘",\"bm\":\"璐㈠姟閮╘",\"name\":\"鐢版尟浼焅",\"sex\":\"鐢穃",\"userCode\":\"03252092\",\"phone\":18537205062,\"isOk\":\"鏄痋"},{\"jg\":\"甯傚満钀ラ攢閮╘",\"bm\":\"甯傚満钀ラ攢閮╘",\"name\":\"寮犳収濞淺",\"sex\":\"濂砛",\"userCode\":\"01517434\",\"phone\":18537201686,\"isOk\":\"\"},{\"jg\":\"瀹夐槼甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"鐜嬬撼\",\"sex\":\"濂砛",\"userCode\":\"01516979\",\"phone\":13937208056,\"isOk\":\"\"},{\"jg\":\"浜哄姏璧勬簮閮╘",\"bm\":\"浜哄姏璧勬簮閮╘",\"name\":\"甯镐竾鍒‐",\"sex\":\"濂砛",\"userCode\":\"03688129\",\"phone\":15836365600,\"isOk\":\"\"},{\"jg\":\"鍏氬鍏氬缓宸ヤ綔閮╘",\"bm\":\"鍏氬鍏氬缓宸ヤ綔閮╘",\"name\":\"璁歌悕\",\"sex\":\"濂砛",\"userCode\":\"03963493\",\"phone\":18537206571,\"isOk\":\"\"},{\"jg\":\"绾鍔炲叕瀹",\"bm\":\"绾鍔炲叕瀹",\"name\":\"寮犳湅浼焅",\"sex\":\"鐢穃",\"userCode\":\"01517482\",\"phone\":18537205283,\"isOk\":\"\"},{\"jg\":\"鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"鏈嶅姟璐ㄩ噺閮╘",\"name\":\"寮犳洣\",\"sex\":\"濂砛",\"userCode\":\"03894377\",\"phone\":18503721669,\"isOk\":\"\"},{\"jg\":\"閲戣瀺涓氬姟閮╘",\"bm\":\"閲戣瀺涓氬姟閮╘",\"name\":\"寮犺濞淺",\"sex\":\"濂砛",\"userCode\":\"01525739\",\"phone\":18537201813,\"isOk\":\"\"},{\"jg\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"鏉滅憺寮篭",\"sex\":\"鐢穃",\"userCode\":\"01515685\",\"phone\":17603721968,\"isOk\":\"\"},{\"jg\":\"娓犻亾骞冲彴閮╘",\"bm\":\"娓犻亾骞冲彴閮╘",\"name\":\"鏉ㄧ孩\",\"sex\":\"濂砛",\"userCode\":\"01517259\",\"phone\":18037299990,\"isOk\":\"\"},{\"jg\":\"鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"鏈鸿閫氫俊鍒嗗眬\",\"name\":\"钁ｅ潳\",\"sex\":\"鐢穃",\"userCode\":\"03696188\",\"phone\":18567721602,\"isOk\":\"\"},{\"jg\":\"宸ヤ細\",\"bm\":\"宸ヤ細\",\"name\":\"鐜嬪埄钀峔",\"sex\":\"濂砛",\"userCode\":\"01516973\",\"phone\":17698303900,\"isOk\":\"\"},{\"jg\":\"瀵勯�掍簨涓氶儴\",\"bm\":\"瀵勯�掍簨涓氶儴\",\"name\":\"閮懢鐝慭",\"sex\":\"鐢穃",\"userCode\":1515825,\"phone\":18837215926,\"isOk\":\"\"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"name\":\"浠昏崳濞淺",\"sex\":\"濂砛",\"userCode\":\"03776328\",\"phone\":15836322356,\"isOk\":\"\"},{\"jg\":\"杩愯惀绠＄悊閮╘",\"bm\":\"杩愯惀绠＄悊閮╘",\"name\":\"鐗涙枃闈橽",\"sex\":\"濂砛",\"userCode\":\"03559114\",\"phone\":13523325066,\"isOk\":\"\"},{\"jg\":\"瀹夐槼鍘垮垎鍏徃\",\"bm\":\"瀹夐槼鍘垮垎鍏徃\",\"name\":\"瀹嬬拠\",\"sex\":\"濂砛",\"userCode\":\"03363695\",\"phone\":13683722950,\"isOk\":\"\"},{\"jg\":\"鏋楀窞甯傚垎鍏徃\",\"bm\":\"鏋楀窞甯傚垎鍏徃\",\"name\":\"閭撴檽鏋梊",\"sex\":\"濂砛",\"userCode\":\"03363779\",\"phone\":13673722927,\"isOk\":\"鏄痋"},{\"jg\":\"婊戝幙鍒嗗叕鍙竆",\"bm\":\"婊戝幙鍒嗗叕鍙竆",\"name\":\"閭垫箾娲媆",\"sex\":\"鐢穃",\"userCode\":\"03347421\",\"phone\":18537205255,\"isOk\":\"鏄痋"},{\"jg\":\"鍐呴粍鍘垮垎鍏徃\",\"bm\":\"鍐呴粍鍘垮垎鍏徃\",\"name\":\"鏉庡笇鍫俓",\"sex\":\"鐢穃",\"userCode\":\"01516257\",\"phone\":13613728836,\"isOk\":\"鏄痋"},{\"jg\":\"姹ら槾鍘垮垎鍏徃\",\"bm\":\"姹ら槾鍘垮垎鍏徃\",\"name\":\"杩炴ⅵ\",\"sex\":\"濂砛",\"userCode\":\"03364262\",\"phone\":15993801114,\"isOk\":\"鏄痋"},{\"jg\":\"榫欏畨鍖哄垎鍏徃\",\"bm\":\"榫欏畨鍖哄垎鍏徃\",\"name\":\"鏉庡織濞淺",\"sex\":\"濂砛",\"userCode\":\"01516312\",\"phone\":13460821473,\"isOk\":\"鏄痋"},{\"jg\":\"鏂囧嘲鍖哄垎鍏徃\",\"bm\":\"鏂囧嘲鍖哄垎鍏徃\",\"name\":\"鍒樺ぇ浼焅",\"sex\":\"鐢穃",\"userCode\":\"03994629\",\"phone\":18537200905,\"isOk\":\"鏄痋"}]";
+        Long dqAy = 100005L;
+        Map<String, Object> dqMapAy = new HashMap<>();
+        dqMapAy.put("dq", dqAy);
+        dqMapAy.put("jsonObj", jsonObjAy);
+        selLi.add(dqMapAy);
+
+
+        // 鍛ㄥ彛
+        String jsonObjZk = "[{\"jg\":\"鍛ㄥ彛甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"鐜嬪磭鍏塡",\"sex\":\"鐢穃",\"userCode\":\"03696337\",\"phone\":18272856661,\"isOk\":\"鏄痋"},{\"jg\":\"甯傚垎鍏徃璐㈠姟閮╘",\"bm\":\"甯傚垎鍏徃璐㈠姟閮╘",\"name\":\"鐜嬫シ鏂嘰",\"sex\":\"鐢穃",\"userCode\":\"04195483\",\"phone\":15503942999,\"isOk\":\"\"}]";
+        Long dqZk = 100014L;
+        Map<String, Object> dqMapZk = new HashMap<>();
+        dqMapZk.put("dq", dqZk);
+        dqMapZk.put("jsonObj", jsonObjZk);
+        selLi.add(dqMapZk);
+
+        // 寮�灏�
+        String jsonObjKf = "[{\"jg\":\"寮�灏佸競瀹嬪煄鍖哄垎鍏徃\",\"bm\":\"瀹嬪煄鍖哄垎鍏徃\",\"name\":\"鐜嬬惓\",\"sex\":\"濂砛",\"userCode\":\"01508234\",\"phone\":13723227800,\"isOk\":\"鏄痋"},{\"jg\":\"寮�灏佸競鏂板尯鍒嗗叕鍙竆",\"bm\":\"鏂板尯鍒嗗叕鍙竆",\"name\":\"鏌存櫠\",\"sex\":\"濂砛",\"userCode\":\"01508342\",\"phone\":13903787795,\"isOk\":\"鏄痋"},{\"jg\":\"鏉炲幙鍒嗗叕鍙竆",\"bm\":\"鏉炲幙鍒嗗叕鍙竆",\"name\":\"鏉ㄦ案姘慭",\"sex\":\"鐢穃",\"userCode\":\"01508854\",\"phone\":\"13937804028\",\"isOk\":\"鏄痋"},{\"jg\":\"閫氳鍘垮垎鍏徃\",\"bm\":\"閫氳鍘垮垎鍏徃\",\"name\":\"鏉庡崼\",\"sex\":\"鐢穃",\"userCode\":\"03283795\",\"phone\":13781114087,\"isOk\":\"鏄痋"},{\"jg\":\"灏夋皬鍘垮垎鍏徃\",\"bm\":\"灏夋皬鍘垮垎鍏徃\",\"name\":\"閮庢収涓絓",\"sex\":\"濂砛",\"userCode\":\"01509234\",\"phone\":13569532629,\"isOk\":\"鏄痋"},{\"jg\":\"寮�灏佸競绁ョ鍖哄垎鍏徃\",\"bm\":\"绁ョ鍖哄垎鍏徃\",\"name\":\"鍒樻案闈抃",\"sex\":\"鐢穃",\"userCode\":\"01509525\",\"phone\":13903785580,\"isOk\":\"鏄痋"},{\"jg\":\"鍏拌�冨幙鍒嗗叕鍙竆",\"bm\":\"鍏拌�冨幙鍒嗗叕鍙竆",\"name\":\"榛勮繛褰琝",\"sex\":\"鐢穃",\"userCode\":\"03339498\",\"phone\":13663788616,\"isOk\":\"鏄痋"},{\"jg\":\"寮�灏佸競鍒嗗叕鍙竆",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"姊佹枌\",\"sex\":\"鐢穃",\"userCode\":\"03822830\",\"phone\":15093636828,\"isOk\":\"鏄痋"},{\"jg\":\"甯傚満钀ラ攢閮╘",\"bm\":\"甯傚満钀ラ攢閮╘",\"name\":\"鐜嬫槑纾奬",\"sex\":\"鐢穃",\"userCode\":\"01508449\",\"phone\":13603786979,\"isOk\":\"鏄痋"},{\"jg\":\"杩愯惀绠＄悊閮╘",\"bm\":\"杩愯惀绠＄悊閮╘",\"name\":\"鐜嬪摬\",\"sex\":\"鐢穃",\"userCode\":\"03208163\",\"phone\":13183258252,\"isOk\":\"鏄痋"},{\"jg\":\"鍏氬缓宸ヤ綔閮╘",\"bm\":\"鍏氬缓宸ヤ綔閮╘",\"name\":\"姊佷箰姘慭",\"sex\":\"鐢穃",\"userCode\":\"04204505\",\"phone\":13693786373,\"isOk\":\"鍚"},{\"jg\":\"璐㈠姟閮╘",\"bm\":\"璐㈠姟閮╘",\"name\":\"鍒橀湠\",\"sex\":\"濂砛",\"userCode\":\"01508087\",\"phone\":13837818346,\"isOk\":\"鍚"},{\"jg\":\"鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"鏈嶅姟璐ㄩ噺閮╘",\"name\":\"寮犱功鐜瞈",\"sex\":\"濂砛",\"userCode\":\"01504635\",\"phone\":13723239080,\"isOk\":\"鍚"},{\"jg\":\"浜哄姏璧勬簮閮╘",\"bm\":\"浜哄姏璧勬簮閮╘",\"name\":\"鐜嬬憺濂嘰",\"sex\":\"鐢穃",\"userCode\":\"03830615\",\"phone\":13525588969,\"isOk\":\"鍚"},{\"jg\":\"閲戣瀺涓氬姟閮╘",\"bm\":\"閲戣瀺涓氬姟閮╘",\"name\":\"璧靛簡鐝峔",\"sex\":\"鐢穃",\"userCode\":\"01508183\",\"phone\":13837819091,\"isOk\":\"鍚"},{\"jg\":\"娓犻亾骞冲彴閮╘",\"bm\":\"娓犻亾骞冲彴閮╘",\"name\":\"闄堥\",\"sex\":\"濂砛",\"userCode\":\"01508609\",\"phone\":13303786200,\"isOk\":\"鍚"},{\"jg\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"鏉庡浆\",\"sex\":\"濂砛",\"userCode\":\"01508579\",\"phone\":13723251609,\"isOk\":\"鍚"},{\"jg\":\"蹇�掑寘瑁逛笓涓氳矗浠讳腑蹇僜",\"bm\":\"蹇�掑寘瑁逛笓涓氳矗浠讳腑蹇僜",\"name\":\"寰愪腹涓筡",\"sex\":\"濂砛",\"userCode\":\"03283761\",\"phone\":18837868981,\"isOk\":\"鍚"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇僜",\"name\":\"娌欐槺鏄昞",\"sex\":\"濂砛",\"userCode\":\"03964580\",\"phone\":18736998885,\"isOk\":\"鍚"},{\"jg\":\"鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"鏈鸿閫氫俊鍒嗗眬\",\"name\":\"鐜嬩笘鏉癨",\"sex\":\"鐢穃",\"userCode\":\"03534994\",\"phone\":13633783888,\"isOk\":\"鍚"}]";
+        Long dqKf = 100002L;
+        Map<String, Object> dqMapKf = new HashMap<>();
+        dqMapKf.put("dq", dqKf);
+        dqMapKf.put("jsonObj", jsonObjKf);
+        selLi.add(dqMapKf);
+
+        // 楣ゅ
+        String jsonObjHb = "[{\"jg\":\"璐㈠姟閮╘",\"bm\":\"璐㈠姟閮╘",\"name\":\"鑰垮畧鏁廫",\"sex\":\"鐢穃",\"userCode\":\"03250361\",\"phone\":15839278086,\"isOk\":\"鏄痋"},{\"jg\":\"楣ゅ甯傚北鍩庡尯鍒嗗叕鍙竆",\"bm\":\"灞卞煄鍖哄垎鍏徃\",\"name\":\"渚晩骞砛",\"sex\":\"濂砛",\"userCode\":\"01518070\",\"phone\":13839237558,\"isOk\":\"鏄痋"},{\"jg\":\"娣囧幙鍒嗗叕鍙竆",\"bm\":\"娣囧幙鍒嗗叕鍙竆",\"name\":\"鐜嬪崕浼焅",\"sex\":\"濂砛",\"userCode\":\"01518185\",\"phone\":13938007161,\"isOk\":\"鏄痋"},{\"jg\":\"娴氬幙鍒嗗叕鍙竆",\"bm\":\"娴氬幙鍒嗗叕鍙竆",\"name\":\"鑳℃案缈燶",\"sex\":\"濂砛",\"userCode\":\"01518249\",\"phone\":13939225206,\"isOk\":\"鏄痋"},{\"jg\":\"楣ゅ甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"娆ч槼鑿茶彶\",\"sex\":\"濂砛",\"userCode\":\"03345239\",\"phone\":16650981118,\"isOk\":\"鍚"},{\"jg\":\"鏍囧揩涓撲笟璐ｄ换涓績\",\"bm\":\"鏍囧揩涓撲笟璐ｄ换涓績\",\"name\":\"寮犺景\",\"sex\":\"鐢穃",\"userCode\":\"03536206\",\"phone\":13939208755,\"isOk\":\"鍚"},{\"jg\":\"鍏氬缓閮╘",\"bm\":\"鍏氬缓閮╘",\"name\":\"瀛欒壋骞砛",\"sex\":\"濂砛",\"userCode\":\"01517919\",\"phone\":13461901899,\"isOk\":\"鍚"},{\"jg\":\"宸ヤ細\",\"bm\":\"宸ヤ細\",\"name\":\"鐗涢洦绾",\"sex\":\"鐢穃",\"userCode\":\"01517765\",\"phone\":18503923777,\"isOk\":\"鍚"},{\"jg\":\"涓夌骇鐗╂祦寤鸿涓撶彮\",\"bm\":\"涓夌骇鐗╂祦寤鸿涓撶彮\",\"name\":\"杩愬\",\"sex\":\"鐢穃",\"userCode\":\"03384784\",\"phone\":13503920298,\"isOk\":\"鍚"},{\"jg\":\"蹇寘涓撲笟璐ｄ换涓績\",\"bm\":\"蹇寘涓撲笟璐ｄ换涓績\",\"name\":\"鐜嬬濮擻",\"sex\":\"鐢穃",\"userCode\":\"03391904\",\"phone\":15839279495,\"isOk\":\"鍚"},{\"jg\":\"甯傚満钀ラ攢閮╘",\"bm\":\"甯傚満钀ラ攢閮╘",\"name\":\"鍚曚節浼焅",\"sex\":\"濂砛",\"userCode\":\"01518041\",\"phone\":13839229519,\"isOk\":\"鍚"},{\"jg\":\"甯傚満钀ラ攢閮ㄤ俊鎭腑蹇僜",\"bm\":\"甯傚満钀ラ攢閮ㄤ俊鎭腑蹇僜",\"name\":\"鍒樻枃绉慭",\"sex\":\"鐢穃",\"userCode\":\"01517803\",\"phone\":13939227075,\"isOk\":\"鍚"},{\"jg\":\"娓犻亾骞冲彴閮╘",\"bm\":\"娓犻亾骞冲彴閮╘",\"name\":\"寮犲潳\",\"sex\":\"濂砛",\"userCode\":\"03536279\",\"phone\":18539221025,\"isOk\":\"鍚"},{\"jg\":\"杩愯惀绠＄悊閮╘",\"bm\":\"杩愯惀绠＄悊閮╘",\"name\":\"鏉庨潤\",\"sex\":\"濂砛",\"userCode\":\"03316271\",\"phone\":13103920166,\"isOk\":\"鍚"},{\"jg\":\"闆嗛偖鏂囦紶閮╘",\"bm\":\"闆嗛偖鏂囦紶閮╘",\"name\":\"鍒樿姵鑺砛",\"sex\":\"濂砛",\"userCode\":\"01517915\",\"phone\":13803921616,\"isOk\":\"鍚"},{\"jg\":\"鏈鸿閫氫俊鍒嗗眬\",\"bm\":\"鏈鸿閫氫俊鍒嗗眬\",\"name\":\"鏉庡\",\"sex\":\"濂砛",\"userCode\":\"01517818\",\"phone\":15939228101,\"isOk\":\"鍚"},{\"jg\":\"閲戣瀺涓氬姟閮╘",\"bm\":\"閲戣瀺涓氬姟閮╘",\"name\":\"寮犵鑺筡",\"sex\":\"濂砛",\"userCode\":\"01517988\",\"phone\":13503925545,\"isOk\":\"鍚"}]";
+        Long dqHb = 100006L;
+        Map<String, Object> dqMapHb = new HashMap<>();
+        dqMapHb.put("dq", dqHb);
+        dqMapHb.put("jsonObj", jsonObjHb);
+        selLi.add(dqMapHb);
+
+        // 鍗楅槼
+        String jsonObjNy = "[{\"jg\":\"鍐呬埂鍘垮垎鍏徃\",\"bm\":\"鍐呬埂鍘垮垎鍏徃\",\"name\":\"鑳℃鏈圽",\"sex\":\"濂砛",\"userCode\":\"03197169\",\"phone\":13849771844,\"isOk\":\"鏄痋"}]";
+        Long dqNy = 100016L;
+        Map<String, Object> dqMapNy = new HashMap<>();
+        dqMapNy.put("dq", dqNy);
+        dqMapNy.put("jsonObj", jsonObjNy);
+        selLi.add(dqMapNy);
+
+        // 閮戝窞
+        String jsonObjZz = "[{\"jg\":\"閮戝窞甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"灏氱户杈塡",\"sex\":\"鐢穃",\"userCode\":\"01505364\",\"phone\":13290909080,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"璧典繆闇瀄",\"sex\":\"濂砛",\"userCode\":\"03450133\",\"phone\":15093121116,\"isOk\":\"鏄痋"},{\"jg\":\"鐧诲皝甯傚垎鍏徃\",\"bm\":\"鐧诲皝甯傚垎鍏徃\",\"name\":\"寮犲悜娉",\"sex\":\"鐢穃",\"userCode\":\"01507299\",\"phone\":13674996555,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯備簩涓冨尯鍒嗗叕鍙竆",\"bm\":\"浜屼竷鍖哄垎鍏徃\",\"name\":\"鍐粔娉",\"sex\":\"鐢穃",\"userCode\":\"03215147\",\"phone\":18703877216,\"isOk\":\"鏄痋"},{\"jg\":\"鑸┖娓尯鍒嗗叕鍙竆",\"bm\":\"鑸┖娓尯鍒嗗叕鍙竆",\"name\":\"瑁村啲涓絓",\"sex\":\"濂砛",\"userCode\":\"03214857\",\"phone\":15890039721,\"isOk\":\"鏄痋"},{\"jg\":\"鑽ラ槼甯傚垎鍏徃\",\"bm\":\"鑽ラ槼甯傚垎鍏徃\",\"name\":\"寮犲埄鏁廫",\"sex\":\"濂砛",\"userCode\":\"01506479\",\"phone\":13838200289,\"isOk\":\"鏄痋"},{\"jg\":\"楂樻柊鍖哄垎鍏徃\",\"bm\":\"楂樻柊鍖哄垎鍏徃\",\"name\":\"鍛ㄧ弬\",\"sex\":\"鐢穃",\"userCode\":\"01505545\",\"phone\":16696139776,\"isOk\":\"鏄痋"},{\"jg\":\"宸╀箟甯傚垎鍏徃\",\"bm\":\"宸╀箟甯傚垎鍏徃\",\"name\":\"寮犳枃宄癨",\"sex\":\"鐢穃",\"userCode\":\"01507008\",\"phone\":13526492666,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傜鍩庡尯鍒嗗叕鍙竆",\"bm\":\"绠″煄鍖哄垎鍏徃\",\"name\":\"瀛熻懙棣橽",\"sex\":\"濂砛",\"userCode\":\"01505026\",\"phone\":13938449798,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傞噾姘村尯鍒嗗叕鍙竆",\"bm\":\"閲戞按鍖哄垎鍏徃\",\"name\":\"闄堟竻鏅揬",\"sex\":\"鐢穃",\"userCode\":\"03462630\",\"phone\":18638111088,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傞儜涓滄柊鍖哄垎鍏徃\",\"bm\":\"閮戜笢鏂板尯鍒嗗叕鍙竆",\"name\":\"璁哥孩涓絓",\"sex\":\"濂砛",\"userCode\":\"01520886\",\"phone\":18838160016,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傛儬娴庡尯鍒嗗叕鍙竆",\"bm\":\"鎯犳祹鍖哄垎鍏徃\",\"name\":\"楂樹匠鍥璡",\"sex\":\"濂砛",\"userCode\":\"04106414\",\"phone\":18837125186,\"isOk\":\"鏄痋"},{\"jg\":\"鏂板瘑甯傚垎鍏徃\",\"bm\":\"鏂板瘑甯傚垎鍏徃\",\"name\":\"鍚曠孩寤篭",\"sex\":\"鐢穃",\"userCode\":\"01507671\",\"phone\":15903656888,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯傜粡寮�鍖哄垎鍏徃\",\"bm\":\"缁忓紑鍖哄垎鍏徃\",\"name\":\"閭㈢嚉鏂怽",\"sex\":\"濂砛",\"userCode\":\"03602293\",\"phone\":13460306010,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯備笂琛楀尯鍒嗗叕鍙竆",\"bm\":\"涓婅鍖哄垎鍏徃\",\"name\":\"璋开\",\"sex\":\"濂砛",\"userCode\":\"03214836\",\"phone\":13523560390,\"isOk\":\"鏄痋"},{\"jg\":\"鏂伴儜甯傚垎鍏徃\",\"bm\":\"鏂伴儜甯傚垎鍏徃\",\"name\":\"缈熷啝娣瀄",\"sex\":\"鐢穃",\"userCode\":\"04217531\",\"phone\":13073752678,\"isOk\":\"鏄痋"},{\"jg\":\"涓墴鍘垮垎鍏徃\",\"bm\":\"涓墴鍘垮垎鍏徃\",\"name\":\"寮犻搧鏌盶",\"sex\":\"鐢穃",\"userCode\":\"01506613\",\"phone\":13503998993,\"isOk\":\"鏄痋"},{\"jg\":\"閮戝窞甯備腑鍘熷尯鍒嗗叕鍙竆",\"bm\":\"涓師鍖哄垎鍏徃\",\"name\":\"娌堟磥\",\"sex\":\"濂砛",\"userCode\":\"01505480\",\"phone\":13526705533,\"isOk\":\"鏄痋"},{\"jg\":\"涓夌骇鐗╂祦浣撶郴寤鸿涓撶彮\",\"bm\":\"涓夌骇鐗╂祦浣撶郴寤鸿涓撶彮\",\"name\":\"鑳′竴鍑",\"sex\":\"濂砛",\"userCode\":\"04196065\",\"phone\":13838240632,\"isOk\":\"鍚"},{\"jg\":\"璐㈠姟閮╘",\"bm\":\"璐㈠姟閮╘",\"name\":\"鏉庝附\",\"sex\":\"濂砛",\"userCode\":\"01503172\",\"phone\":13676927766,\"isOk\":\"鍚"},{\"jg\":\"鍏氬缓宸ヤ綔閮╘",\"bm\":\"鍏氬缓宸ヤ綔閮╘",\"name\":\"寮犲В濮",\"sex\":\"濂砛",\"userCode\":\"03685389\",\"phone\":15637259837,\"isOk\":\"鍚"},{\"jg\":\"宸ヤ細\",\"bm\":\"宸ヤ細\",\"name\":\"鑼冩槬濞淺",\"sex\":\"濂砛",\"userCode\":\"01506805\",\"phone\":15036068866,\"isOk\":\"鍚"},{\"jg\":\"閲戣瀺涓氬姟閮╘",\"bm\":\"閲戣瀺涓氬姟閮╘",\"name\":\"瀛欐湞杈塡",\"sex\":\"鐢穃",\"userCode\":\"01505263\",\"phone\":13700840185,\"isOk\":\"鍚"},{\"jg\":\"娓犻亾骞冲彴閮╘",\"bm\":\"娓犻亾骞冲彴閮╘",\"name\":\"鐜嬫晱\",\"sex\":\"濂砛",\"userCode\":\"03250707\",\"phone\":13783588184,\"isOk\":\"鍚"},{\"jg\":\"浜哄姏璧勬簮閮╘",\"bm\":\"浜哄姏璧勬簮閮╘",\"name\":\"璐鹃缚\",\"sex\":\"濂砛",\"userCode\":\"03680698\",\"phone\":15837136612,\"isOk\":\"鍚"},{\"jg\":\"甯傚満钀ラ攢閮╘",\"bm\":\"甯傚満钀ラ攢閮╘",\"name\":\"鍒樺崏\",\"sex\":\"濂砛",\"userCode\":\"03231040\",\"phone\":13676970012,\"isOk\":\"鍚"},{\"jg\":\"绾鍔炲叕瀹",\"bm\":\"绾鍔炲叕瀹",\"name\":\"鑼冨厗搴穃",\"sex\":\"鐢穃",\"userCode\":\"03791229\",\"phone\":13643820645,\"isOk\":\"鍚"},{\"jg\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"bm\":\"闆嗛偖涓庢枃鍖栦紶濯掗儴\",\"name\":\"璐捐摀\",\"sex\":\"濂砛",\"userCode\":\"03215066\",\"phone\":13503719775,\"isOk\":\"鍚"},{\"jg\":\"鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"鏈嶅姟璐ㄩ噺閮╘",\"name\":\"濮滃叞\",\"sex\":\"濂砛",\"userCode\":\"01505069\",\"phone\":13523410345,\"isOk\":\"鍚"},{\"jg\":\"鏈嶅姟璐ㄩ噺閮╘",\"bm\":\"鏈嶅姟璐ㄩ噺閮╘",\"name\":\"鑻忔枃鏂嘰",\"sex\":\"濂砛",\"userCode\":\"03964570\",\"phone\":18569922944,\"isOk\":\"鍚"},{\"jg\":\"閮戝窞甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"濮腑鐓淺",\"sex\":\"鐢穃",\"userCode\":\"01503072\",\"phone\":13523711960,\"isOk\":\"鍚"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冩斂鍔¤惀閿�涓績\",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冩斂鍔¤惀閿�涓績\",\"name\":\"寮犳偊\",\"sex\":\"濂砛",\"userCode\":\"03911249\",\"phone\":15713716192,\"isOk\":\"鍚"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冨晢浼佽惀閿�涓績\",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冨晢浼佽惀閿�涓績\",\"name\":\"浠樻枃闈橽",\"sex\":\"濂砛",\"userCode\":\"03687135\",\"phone\":13103861988,\"isOk\":\"鍚"},{\"jg\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冪渷韬唤璇侀」鐩甛",\"bm\":\"鏍囧噯蹇�掍笓涓氳矗浠讳腑蹇冪渷韬唤璇侀」鐩甛",\"name\":\"寰愯█\",\"sex\":\"鐢穃",\"userCode\":\"03897314\",\"phone\":15838172020,\"isOk\":\"鍚"}]";
+        Long dqZz = 100001L;
+        Map<String, Object> dqMapZz = new HashMap<>();
+        dqMapZz.put("dq", dqZz);
+        dqMapZz.put("jsonObj", jsonObjZz);
+        selLi.add(dqMapZz);
+
+        // 淇￠槼
+        String jsonObjXy = "[{\"jg\":\"淇￠槼甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"璁告槬鍏塡",\"sex\":\"鐢穃",\"userCode\":\"01543085\",\"phone\":16637666376,\"isOk\":\"鍚︼紙璇烽绠＄悊浜哄憳锛塡"},{\"jg\":\"淇￠槼甯傚垎鍏徃\",\"bm\":\"缁煎悎鍔炲叕瀹",\"name\":\"鐜嬮箯\",\"sex\":\"鐢穃",\"userCode\":\"03498941\",\"phone\":13937611122,\"isOk\":\"鏄痋"},{\"jg\":\"鎭幙鍒嗗叕鍙竆",\"bm\":\"鎭幙鍒嗗叕鍙竆",\"name\":\"鏉庢槉鐝篭",\"sex\":\"鐢穃",\"userCode\":\"04207355\",\"phone\":13333766366,\"isOk\":\"鏄痋"},{\"jg\":\"娼㈠窛鍘垮垎鍏徃\",\"bm\":\"娼㈠窛鍘垮垎鍏徃\",\"name\":\"璋粊娴‐",\"sex\":\"鐢穃",\"userCode\":\"03680127\",\"phone\":18211700252,\"isOk\":\"鏄痋"},{\"jg\":\"鍏夊北鍘垮垎鍏徃\",\"bm\":\"鍏夊北鍘垮垎鍏徃\",\"name\":\"鏉滅櫥鏂癨",\"sex\":\"鐢穃",\"userCode\":\"01544502\",\"phone\":18697730280,\"isOk\":\"鏄痋"},{\"jg\":\"淇￠槼甯傞儕鍖哄垎鍏徃\",\"bm\":\"淇￠槼甯傞儕鍖哄垎鍏徃\",\"name\":\"鍚存枌\",\"sex\":\"鐢穃",\"userCode\":\"01544712\",\"phone\":13603768697,\"isOk\":\"鏄痋"},{\"jg\":\"閮婂尯鍒嗗叕鍙竆",\"bm\":\"娌冲崡鐪佷俊闃冲競鍟嗗煄鍘垮垎鍏徃\",\"name\":\"鏉ㄩ\",\"sex\":\"鐢穃",\"userCode\":\"01545654\",\"phone\":13837623456,\"isOk\":\"鏄痋"},{\"jg\":\"鍥哄鍘垮垎鍏徃\",\"bm\":\"鍥哄鍘垮垎鍏徃\",\"name\":\"鏈卞\",\"sex\":\"濂砛",\"userCode\":\"03300918\",\"phone\":13723108456,\"isOk\":\"鏄痋"},{\"jg\":\"鏂板幙鍒嗗叕鍙竆",\"bm\":\"鏂板幙鍒嗗叕鍙竆",\"name\":\"涓ヨ悕\",\"sex\":\"濂砛",\"userCode\":\"03473775\",\"phone\":15194491404,\"isOk\":\"鏄痋"},{\"jg\":\"缃楀北鍘垮垎鍏徃\",\"bm\":\"缃楀北鍘垮垎鍏徃\",\"name\":\"鍚曢敗浜甛",\"sex\":\"鐢穃",\"userCode\":\"03184436\",\"phone\":13526075366,\"isOk\":\"鏄痋"}]";
+        Long dqXy = 100017L;
+        Map<String, Object> dqMapXy = new HashMap<>();
+        dqMapXy.put("dq", dqXy);
+        dqMapXy.put("jsonObj", jsonObjXy);
+        selLi.add(dqMapXy);
+
+
+        for (Map<String, Object> map1 : selLi) {
+            String jsonObj = map1.get("jsonObj").toString();
+            Long dq = (Long) map1.get("dq");
+
+            List<Map<String, Object>> list = JSON.parseObject(jsonObj, new TypeReference<ArrayList>() {
+            });
+            int i = 0;
+            for (Map<String, Object> map : list) {
+                Object jgObj = map.get("jg");
+                Object bmObj = map.get("bm");
+                // 鍏堟煡璇㈡満鏋�(name)
+                //             FinSysTenant finSysTenant1 = finSysTenantService.selectByName(jgObj.toString());
+                FinSysTenant finSysTenant = finSysTenantService.selectByNameAndPid(dq, jgObj.toString());
+                if (finSysTenant == null) {
+                    finSysTenant = finSysTenantService.selectByNameAndPid100(dq, jgObj.toString());
+                }
+                if (finSysTenant == null) {
+                    finSysTenant = finSysTenantService.selectByNameAndPid0(dq, jgObj.toString());
+                }
+                if (finSysTenant == null) {
+                    continue;
+                }
+                // 鍐嶆煡璇㈤儴闂�(name+鏈烘瀯id)
+                FinSysTenantDepartment sysDept = finSysTenantDepartmentService.getByTenantIdAndName(finSysTenant.getId(), bmObj.toString());
+                if (sysDept == null) {
+                    continue;
+                }
+                map.get("bm");
+                Object sexObj = map.get("sex");
+                Object userCodeObj = map.get("userCode");
+                Object nameObj = map.get("name");
+                Object phoneObj = map.get("phone");
+                FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
+                finSysTenantUser.setSeq(1L);
+                if (sexObj != null && sexObj.toString().equals("鐢�")) {
+                    finSysTenantUser.setSex(1);
+                } else {
+                    finSysTenantUser.setSex(2);
+                }
+                finSysTenantUser.setStatus(1);
+                finSysTenantUser.setSysDeptId(sysDept.getId());
+                finSysTenantUser.setTenantId(finSysTenant.getId().toString());
+                finSysTenantUser.setUserCode(userCodeObj.toString());
+                finSysTenantUser.setUserName(nameObj.toString());
+                finSysTenantUser.setUserPhone(phoneObj.toString());
+                List<Long> roleList = new ArrayList<>();
+                roleList.add(1695901062393L);
+                finSysTenantUser.setRoleList(roleList);
+                // 鍐嶆彃鍏ョ敤鎴�
+                ResponseValue responseValue = add1(finSysTenantUser);
+                i++;
+                log.info("娣诲姞绗�" + i + "鐢ㄦ埛锛�" + finSysTenantUser.toString() + "缁撴灉锛�" + responseValue.toString());
+            }
+            log.info("鎵ц瀹屾瘯....鎵ц" + i + "鏉℃暟鎹�");
+        }
+        // 鍐嶅垎閰嶄粨搴�
+        // 鍐嶅垎閰嶄粨搴撶鐞嗗憳
+        return "鎵ц瀹屾瘯";
+    }
+
+
+    private void buildTenantUser(FinSysTenantUser tenantUser, FinSysTenantUser sysInfo) {
+        tenantUser.setId(NumberGenerator.getLongSequenceNumber());
+        tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+        tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
+        tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+        tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
+        // 鏄惁鍒犻櫎 0鏄� 1鍚�
+        tenantUser.setIsDelete(0);
+        tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
+        setUserPhone(tenantUser, tenantUser.getUserPhone());
+        String tenantId = tenantUser.getTenantId();
+        FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
+        tenantUser.setTenantCode(finSysTenant.getCode());
+
+        // 澶勭悊鏂规硶addSupplier
+        if (sysInfo != null) {
+            tenantUser.setIsDelete(1);
+            tenantUser.setLv(sysInfo.getLv());
+            tenantUser.setTenantCode(sysInfo.getTenantCode());
+            tenantUser.setTenantId(sysInfo.getTenantId());
+            // 杩愮淮绠＄悊
+            tenantUser.setSysDeptId(2L);
+        }
+
+    }
+
+    private void setUserPhone(FinSysTenantUser tenantUser, String userPhone) {
         // 鍔犲瘑鎵嬫満鍙�
         String key = PlatformRSAUtils.AES_KEY;
         String encPhone = "";
-        if (user.getUserPhone() != null) {
-            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+        if (StringUtils.isNotEmpty(userPhone)) {
+            encPhone = AESUtils.encryptStrAES(userPhone, key);
         }
-        user.setUserPhone(encPhone);
-        // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
-        user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
-        this.finSysTenantUserService.insert(user);
-        // 鎻掑叆骞冲彴鐢ㄦ埛
+        tenantUser.setUserPhone(encPhone);
+    }
+
+    private S_user_core getsUserCore(FinSysTenantUser tenantUser) {
         S_user_core userCore = new S_user_core();
-        userCore.setId(user.getSysUserId());
-        userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
-        userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
+        userCore.setId(tenantUser.getSysUserId());
+        // 閮ㄩ棬id 閮ㄩ棬淇℃伅鏈悓姝ワ紝鍙～鍏呮暟鎹�
+        userCore.setDept_id(tenantUser.getSysDeptId());
+        // 鏈烘瀯id
+        userCore.setOrg_id(tenantUser.getSysDeptId());
         userCore.setOrg_id(1L);
-        userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
-        userCore.setNick_name(user.getUserName());
+        // 鐢ㄦ埛璐﹀彿
+        userCore.setUser_name(tenantUser.getUserCode());
+        userCore.setNick_name(tenantUser.getUserName());
         // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
         userCore.setUser_type(2);
-        userCore.setPhonenumber(encPhone);
-        userCore.setSex(user.getSex().toString());
+        userCore.setPhonenumber(tenantUser.getUserPhone());
+        userCore.setSex(tenantUser.getSex().toString());
         // 鍒濆鍖栧瘑鐮� 123456
         String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
         userCore.setPassword(pws);
         // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
-        if (user.getStatus() == 0) {
-            user.setStatus(1);
+        if (tenantUser.getStatus() == 0) {
+            userCore.setStatus(1);
         } else {
-            user.setStatus(0);
+            userCore.setStatus(0);
         }
-        userCore.setStatus(user.getStatus());
         userCore.setDel_flag(0);
         userCore.setCreate_by(this.getCurrentUser().getUser_name());
         userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        userCore.setRemark(user.getRemark());
+        userCore.setRemark(tenantUser.getRemark());
         userCore.setType(1);
         userCore.setBind_client_id("0");
         userCore.setBind_wechat(0);
@@ -286,16 +478,7 @@
         userCore.setType(1);
         // 鍟嗘埛id锛�0-骞冲彴
         userCore.setMer_id(0L);
-        this.userService.insert(userCore);
-        // 鎻掑叆骞冲彴鏈烘瀯
-        // 灏戣鑹瞚d
-        List<Long> roleList = user.getRoleList(); // 鏈烘瀯id 澶氫釜
-        if (!CollectionUtils.isEmpty(roleList)) {
-            Long sysUserId = user.getSysUserId(); // 鐢ㄦ埛id
-            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
-        }
-        // this.getFinCustomerCache().remove();
-        return ResponseValue.success(1);
+        return userCore;
     }
 
     /**
@@ -305,9 +488,9 @@
      */
     @PostMapping("/import")
     public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file)
-        throws IOException {
+            throws IOException {
         String originalFilename = file.getOriginalFilename();
-        if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
+        if (!originalFilename.endsWith("xls")) {
             return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
         }
         S_user_core currentUser = this.getCurrentUser();
@@ -322,82 +505,81 @@
         List<S_role> roles = this.roleService.select(new S_role());
         ArrayList<FinSysTenantUser> finSysTenantUsers = new ArrayList<>();
 
-        EasyExcel.read(file.getInputStream(), ImportUserParam.class, new AnalysisEventListener<ImportUserParam>() {
-            @Override
-            public void invoke(ImportUserParam data, AnalysisContext context) {
-                if (StringUtils.isEmpty(data.getUserName()) || StringUtils.isEmpty(data.getUserCode())
-                    || StringUtils.isEmpty(data.getUserPhone()) || null == data.getSex()
-                    || StringUtils.isEmpty(data.getEmail()) || null == data.getSeq()
-                    || StringUtils.isEmpty(data.getRoleName())) {
-                    throw new ImportUserParamVerifyException("鍗曞厓鏍间笉鑳戒负绌�!");
-                }
-                // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
-                if (finSysTenantUserService.getByUserCode(data.getUserCode()) > 0) {
-                    throw new ImportUserParamVerifyException("鍛樺伐缂栧彿涓虹┖鎴栧凡瀛樺湪!");
-                }
-                if (data.getSex() < 1 && data.getSex() > 0) {
-                    throw new ImportUserParamVerifyException("鎬у埆鐮佸彧鑳戒负 0 鎴� 1");
-                }
-                FinSysTenantUser user = new FinSysTenantUser();
-                user.setUserName(data.getUserName());
-                user.setUserCode(data.getUserCode());
-                user.setUserPhone(data.getUserPhone());
-                user.setSex(data.getSex());
-                user.setEmail(data.getEmail());
-                user.setSeq(data.getSeq());
-                user.setTenantId(tenantId);
-                user.setTenantCode(tenantCode);
-                // 璁剧疆瑙掕壊
-                Optional<S_role> sRole =
-                    roles.stream().filter(role -> role.getRole_name().equals(data.getRoleName())).findFirst();
-                user.setRoleList(Arrays.asList(sRole.orElse(new S_role()).getRole_id()));
+        EasyExcelFactory
+                .read(file.getInputStream(), ImportUserParam.class, new AnalysisEventListener<ImportUserParam>() {
+                    @Override
+                    public void invoke(ImportUserParam data, AnalysisContext context) {
+                        if (StringUtils.isEmpty(data.getUserName()) || StringUtils.isEmpty(data.getUserCode())
+                                || StringUtils.isEmpty(data.getUserPhone()) || null == data.getSex()
+                                || StringUtils.isEmpty(data.getEmail()) || null == data.getSeq()
+                                || StringUtils.isEmpty(data.getRoleName())) {
+                            throw new ImportUserParamVerifyException("鍗曞厓鏍间笉鑳戒负绌�!");
+                        }
+                        // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
+                        if (finSysTenantUserService.getByUserCode(data.getUserCode()) != null) {
+                            throw new ImportUserParamVerifyException("鍛樺伐缂栧彿涓虹┖鎴栧凡瀛樺湪!");
+                        }
+                        if (data.getSex() < 1 && data.getSex() > 0) {
+                            throw new ImportUserParamVerifyException("鎬у埆鐮佸彧鑳戒负 0 鎴� 1");
+                        }
+                        FinSysTenantUser user = new FinSysTenantUser();
+                        user.setUserName(data.getUserName());
+                        user.setUserCode(data.getUserCode());
+                        user.setUserPhone(data.getUserPhone());
+                        user.setSex(data.getSex());
+                        user.setEmail(data.getEmail());
+                        user.setSeq(data.getSeq());
+                        user.setTenantId(tenantId);
+                        user.setTenantCode(tenantCode);
+                        // 璁剧疆瑙掕壊
+                        Optional<S_role> sRole =
+                                roles.stream().filter(role -> role.getRole_name().equals(data.getRoleName())).findFirst();
+                        user.setRoleList(Arrays.asList(sRole.orElse(new S_role()).getRole_id()));
 
-                user.setId(NumberGenerator.getLongSequenceNumber());
-                user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-                user.setCreateBy(currentUser.getUser_name());
-                user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-                user.setUpdateBy(currentUser.getUser_name());
-                user.setStatus(1);// 0绂佺敤 1鍚敤
-                user.setIsDelete(0);// 鏄惁鍒犻櫎 0鏄� 1鍚�
-                user.setSysUserId(NumberGenerator.getLongSequenceNumber());
-                user.setRemark("鎵归噺瀵煎叆");
-                // 鍔犲瘑鎵嬫満鍙�
-                String key = PlatformRSAUtils.AES_KEY;
-                String encPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
-                user.setUserPhone(encPhone);
+                        user.setId(NumberGenerator.getLongSequenceNumber());
+                        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+                        user.setCreateBy(currentUser.getUser_name());
+                        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+                        user.setUpdateBy(currentUser.getUser_name());
+                        user.setStatus(1);// 0绂佺敤 1鍚敤
+                        user.setIsDelete(0);// 鏄惁鍒犻櫎 0鏄� 1鍚�
+                        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
+                        user.setRemark("鎵归噺瀵煎叆");
+                        // 鍔犲瘑鎵嬫満鍙�
+                        setUserPhone(user, data.getUserPhone());
 
-                user.setIsDelete(1);
-                // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
-                user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
-                finSysTenantUsers.add(user);
-            }
-
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext context) {
-
-            }
-
-            @Override
-            public void onException(Exception exception, AnalysisContext context) throws Exception {
-                if (exception != null) {
-                    // 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿 灏佽鏃跺紓甯�
-                    if (exception instanceof ExcelDataConvertException) {
-                        ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
-                        logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
-                            excelDataConvertException.getColumnIndex() + 1,
-                            excelDataConvertException.getCellData().getStringValue());
-                        throw new IllegalStateException("绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�"
-                            + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯革紝寮傚父鏁版嵁涓�:[ "
-                            + excelDataConvertException.getCellData().getStringValue() + " ]");
+                        user.setIsDelete(1);
+                        // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
+                        user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+                        finSysTenantUsers.add(user);
                     }
-                    if (exception instanceof ImportUserParamVerifyException) {
-                        throw new IllegalStateException("绗�" + context.readSheetHolder().getRowIndex() + "琛�, 瑙ｆ瀽閿欒:[ "
-                            + exception.getMessage() + " ]");
+
+                    @Override
+                    public void doAfterAllAnalysed(AnalysisContext context) {
+
                     }
-                    throw exception;
-                }
-            }
-        }).sheet().doRead();
+
+                    @Override
+                    public void onException(Exception exception, AnalysisContext context) throws Exception {
+                        if (exception != null) {
+                            // 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿 灏佽鏃跺紓甯�
+                            if (exception instanceof ExcelDataConvertException) {
+                                ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
+                                logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
+                                        excelDataConvertException.getColumnIndex() + 1,
+                                        excelDataConvertException.getCellData().getStringValue());
+                                throw new IllegalStateException("绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�"
+                                        + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯革紝寮傚父鏁版嵁涓�:[ "
+                                        + excelDataConvertException.getCellData().getStringValue() + " ]");
+                            }
+                            if (exception instanceof ImportUserParamVerifyException) {
+                                throw new IllegalStateException("绗�" + context.readSheetHolder().getRowIndex() + "琛�, 瑙ｆ瀽閿欒:[ "
+                                        + exception.getMessage() + " ]");
+                            }
+                            throw exception;
+                        }
+                    }
+                }).sheet().doRead();
 
         insertUserAndUserCoreBatch(finSysTenantUsers);
 
@@ -412,49 +594,7 @@
         ArrayList<S_user_core> sUserCores = new ArrayList<>();
         for (FinSysTenantUser user : finSysTenantUsers) {
             // 鎻掑叆骞冲彴鐢ㄦ埛
-            S_user_core userCore = new S_user_core();
-            userCore.setId(user.getSysUserId());
-            userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
-            userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
-            userCore.setOrg_id(1L);
-            userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
-            userCore.setNick_name(user.getUserName());
-            // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
-            userCore.setUser_type(2);
-            userCore.setPhonenumber(user.getUserPhone());
-            userCore.setSex(user.getSex().toString());
-            // 鍒濆鍖栧瘑鐮� 123456
-            String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
-            userCore.setPassword(pws);
-            // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
-            if (user.getStatus() == 0) {
-                user.setStatus(1);
-            } else {
-                user.setStatus(0);
-            }
-            userCore.setStatus(user.getStatus());
-            userCore.setDel_flag(0);
-            userCore.setCreate_by(this.getCurrentUser().getUser_name());
-            userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-            userCore.setRemark(user.getRemark());
-            userCore.setType(1);
-            userCore.setBind_client_id("0");
-            userCore.setBind_wechat(0);
-            userCore.setModify_pwd(0);
-            userCore.setBind_mobile(0);
-            userCore.setBind_mail(0);
-            userCore.setProfile_id(0L);
-            userCore.setIs_wechat_public(0);
-            userCore.setIs_wechat_routine(0);
-            userCore.setIs_wechat_ios(0);
-            userCore.setIs_wechat_android(0);
-            userCore.setIs_logoff(0);
-            userCore.setLogoff_time(0L);
-            userCore.setIs_sms(0);
-            // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
-            userCore.setType(1);
-            // 鍟嗘埛id锛�0-骞冲彴
-            userCore.setMer_id(0L);
+            S_user_core userCore = getsUserCore(user);
             sUserCores.add(userCore);
         }
         // 淇濆瓨鐢ㄦ埛淇℃伅
@@ -485,33 +625,51 @@
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue update() {
         FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, formInventoryParam);
-        user = formInventoryParam;
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, tenantUser);
 
-        if (user == null) {
+        if (tenantUser == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
-        String key = PlatformRSAUtils.AES_KEY;
-        String encPhone = "";
-        if (user.getUserPhone() != null) {
-            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
-        }
-        user.setUserPhone(encPhone);
+        setUserPhone(tenantUser, tenantUser.getUserPhone());
         // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
-        finSysTenantUserService.update(user);
+        finSysTenantUserService.update(tenantUser);
         // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
+        S_user_core userCore = buildUpdateUserCore(user);
+        this.userService.update(userCore);
+        // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
+        // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
+        // 宸叉湁鐨勬潈闄�
+        Long sysUserId = user.getSysUserId();
+        List<S_role> list = finSysTenantUserService.getRoleBySysUserId(sysUserId);
+        // 閫夋嫨鐨勬潈闄�
+        List<Long> roleList = user.getRoleList();
+        // 鍏堝垹闄ゅ啀娣诲姞
+        if (!CollectionUtils.isEmpty(list)) {
+            finSysTenantUserService.execDelRoleUserList(sysUserId);
+            // 鍒犻櫎搴撶鍛樹俊鎭褰�
+            list.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst()
+                .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
+        }
+        if (!CollectionUtils.isEmpty(roleList)) {
+            // 鍥犱负涓嶇煡閬撹鐢ㄦ埛闇�瑕佺鐞嗛偅涓粨搴� 鏁呬笉鏂板浠撳簱绠＄悊鍛樹俊鎭紝鍙坊鍔犺鑹�
+            finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
+        }
+        this.getFinSysTenantUserCache().remove(sysUserId.toString());
+        return ResponseValue.success(1);
+    }
+
+    private S_user_core buildUpdateUserCore(FinSysTenantUser user) {
         S_user_core userCore = new S_user_core();
         userCore.setId(user.getSysUserId());
         userCore.setUpdate_by(this.getCurrentUser().getUser_name());
         userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
         // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
         if (user.getStatus() == 0) {
-            user.setStatus(1);
+            userCore.setStatus(1);
         } else {
-            user.setStatus(0);
+            userCore.setStatus(0);
         }
-        userCore.setStatus(user.getStatus());
         if (user.getSex() != null) {
             userCore.setSex(user.getSex().toString());
         }
@@ -519,20 +677,8 @@
         userCore.setNick_name(user.getUserName());
         // 鍔犲瘑鎵嬫満鍙�
         userCore.setPhonenumber(user.getUserPhone());
-        this.userService.update(userCore);
-        // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
-        // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
-        List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
-        List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
-        // 鍏堝垹闄ゅ啀娣诲姞
-        if (list != null && list.size() > 0) {
-            finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
-        }
-        if (roleList != null && roleList.size() > 0) {
-            finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
-        }
-        this.getFinSysTenantUserCache().remove(user.getSysUserId() + "");
-        return ResponseValue.success(1);
+
+        return userCore;
     }
 
     /**
@@ -543,33 +689,21 @@
     @PostMapping("/updateStatus")
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue updateStatus() {
-        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, formInventoryParam);
-        user = formInventoryParam;
-        if (user == null) {
+        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, tenantUser);
+        if (tenantUser == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER 搴旇鏄煡璇� 鐒跺悗鍙敼鐘舵��
-        List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(user.getId()));
-        if (select == null || select.size() == 0) {
+        FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneById(tenantUser.getId().toString());
+        if (finSysTenantUser == null) {
             return ResponseValue.error("鐢ㄦ埛涓嶅瓨鍦�");
         }
-        FinSysTenantUser finSysTenantUser = select.get(0);
         finSysTenantUser.setStatus(user.getStatus());
         finSysTenantUserService.update(finSysTenantUser);
         // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
-        S_user_core userCore = new S_user_core();
-        userCore.setId(user.getSysUserId());
-        userCore.setUpdate_by(this.getCurrentUser().getUser_name());
-        userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
-        if (user.getStatus() == 0) {
-            user.setStatus(1);
-        } else {
-            user.setStatus(0);
-        }
-        userCore.setStatus(user.getStatus());
+        S_user_core userCore = buildUpdateUserCore(finSysTenantUser);
         this.userService.update(userCore);
         return ResponseValue.success(1);
     }
@@ -580,18 +714,24 @@
      * @Date 2023/7/17 14:36
      */
     @PostMapping("/defaultPassword")
-    public ResponseValue defaultPassword(@RequestBody FinSysTenantUser finSysTenantUser) {
-        if (finSysTenantUser == null) {
+    public ResponseValue defaultPassword() {
+        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+        CommonUtil.copyProperties(user, tenantUser);
+        user = tenantUser;
+
+        if (Objects.isNull(user)) {
             return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
         // 鍒濆鍖栧瘑鐮� 123456
-        String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 瀵嗘枃
+        // 瀵嗘枃
+        String password = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
         // 1. 淇敼鐢ㄦ埛琛�
         // 鐢ㄦ埛琛╥d
-        Long sysUserId = finSysTenantUser.getSysUserId();
+        Long sysUserId = user.getSysUserId();
         S_user_core userCore = new S_user_core();
         userCore.setId(sysUserId);
-        userCore.setPassword(stringValue);
+        userCore.setPassword(password);
         userCore.setModify_pwd(0);
         userService.update(userCore);
         // 2. 淇敼骞冲彴鐢ㄦ埛锛堜笉鐢ㄤ慨鏀癸級
@@ -613,13 +753,15 @@
         if (finSysTenantUser == null) {
             return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        String s = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
-
-        finSysTenantUser.setUserPhone(s);
+        String phone = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
+        finSysTenantUser.setUserPhone(phone);
         Long sysUserId = finSysTenantUser.getSysUserId();
-        List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
+        List<S_role> roleList = finSysTenantUserService.getRoleBySysUserId(sysUserId);
+        // 杩囨护浠撳簱绠＄悊鍛樼殑鏄剧ず
+        roleList.removeIf(role -> "浠撳簱绠＄悊鍛�".equals(role.getRole_name()));
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("list", list);
+        map.put("list", roleList);
         map.put("data", finSysTenantUser);
         return ResponseValue.success(map);
     }
@@ -642,10 +784,11 @@
                 sysInfo.setUserPhone(AESUtils.decryptStrAES(userPhone, key));
             }
 
-            // 鏌ヨ 鐢ㄦ埛瑙掕壊 TODO 涓存椂瑙ｅ喅 灏嗘潵鏀鹃厤缃枃浠朵腑
+            // 鏌ヨ 鐢ㄦ埛瑙掕壊
             // 宸叉湁鐨勬潈闄�
-            List<S_role> list = finSysTenantUserService.getByUserId(sysInfo.getSysUserId());
+            List<S_role> list = finSysTenantUserService.getRoleBySysUserId(sysInfo.getSysUserId());
             for (S_role s_role : list) {
+                // TODO 涓存椂瑙ｅ喅 灏嗘潵鏀鹃厤缃枃浠朵腑
                 if (s_role.getRole_id() != null && s_role.getRole_id().equals(1690961420053L)) {
                     sysInfo.setKfStatus(1);
                 }
@@ -653,19 +796,15 @@
 
             // 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
             String tenantId = sysInfo.getTenantId();
-            if (tenantId != null && !tenantId.equals("")) {
-                List<FinSysTenant> select = finSysTenantService.select(new FinSysTenant(Long.valueOf(tenantId)));
-                if (select != null && select.size() > 0) {
-                    FinSysTenant finSysTenant = select.get(0);
-                    if (finSysTenant != null && finSysTenant.getParentId() != null) {
-                        List<FinSysTenant> parents =
-                            finSysTenantService.select(new FinSysTenant(finSysTenant.getParentId()));
-                        if (parents != null && parents.size() > 0) {
-                            sysInfo.setParentCode(parents.get(0).getCode());
-                        }
+            if (StringUtils.isNotEmpty(tenantId)) {
+                FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(Long.valueOf(tenantId)));
+                if (finSysTenant != null && finSysTenant.getParentId() != null) {
+                    FinSysTenant parentTenant = finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
+                    if (ObjectUtils.isNotEmpty(parentTenant)) {
+                        sysInfo.setParentCode(parentTenant.getCode());
                     }
-
                 }
+
             }
         }
         return ResponseValue.success(sysInfo);
@@ -679,21 +818,27 @@
     @PostMapping("/updRole")
     public ResponseValue updRole() {
         FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, finSysTenantParam);
-        user = finSysTenantParam;
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, tenantUser);
+        user = tenantUser;
 
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
-        List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
-        List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
+        // 宸叉湁鐨勬潈闄�
+        List<S_role> list = finSysTenantUserService.getRoleBySysUserId(user.getSysUserId());
+        // 閫夋嫨鐨勬潈闄�
+        List<Long> roleList = user.getRoleList();
         // 鍏堝垹闄ゅ啀娣诲姞
-        if (list != null && list.size() > 0) {
-            finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
+        if (!CollectionUtils.isEmpty(list)) {
+            Long sysUserId = user.getSysUserId();
+            finSysTenantUserService.execDelRoleUserList(sysUserId);
+            // 鍒犻櫎搴撶鍛樹俊鎭褰�
+            list.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst()
+                .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
         }
-        if (roleList != null && roleList.size() > 0) {
+        if (!CollectionUtils.isEmpty(roleList)) {
             finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
         }
         return ResponseValue.success(1);
@@ -707,89 +852,31 @@
     @PostMapping("/addSupplier")
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue addSupplier() {
-        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, finSysTenantParam);
-        user = finSysTenantParam;
+        FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUser user = new FinSysTenantUser();
+        CommonUtil.copyProperties(userParam, user);
+
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         // 鑾峰彇杩愮淮绠＄悊
         List<S_dept> depts = this.finSysTenantUserService.selectDept(roleName);
-        if (depts == null || depts.size() == 0) {
+        if (CollectionUtils.isEmpty(depts)) {
             return ResponseValue.error(roleName + "鐨勮鑹蹭笉瀛樺湪");
         }
         // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
-        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
-            && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null) {
             return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
         }
         FinSysTenantUser sysInfo = this.getSysInfo();
         // 鎻掑叆绯荤粺鐢ㄦ埛
-        user.setId(NumberGenerator.getLongSequenceNumber());
-        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        user.setCreateBy(this.getCurrentUser().getUser_name());
-        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        user.setUpdateBy(this.getCurrentUser().getUser_name());
-        user.setIsDelete(0);// 鏄惁鍒犻櫎 0鏄� 1鍚�
-        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
-        user.setIsDelete(1);
-        user.setLv(sysInfo.getLv());
-        user.setTenantCode(sysInfo.getTenantCode());
-        user.setTenantId(sysInfo.getTenantId());
-        user.setSysDeptId(2l); // 杩愮淮绠＄悊
-        // 鍔犲瘑鎵嬫満鍙�
-        String key = PlatformRSAUtils.AES_KEY;
-        String userPhone = user.getUserPhone();
-        String encPhone = "";
-        if (userPhone != null) {
-            encPhone = AESUtils.encryptStrAES(userPhone, key);
-            user.setUserPhone(encPhone);
-        }
-
+        buildTenantUser(user, sysInfo);
         this.finSysTenantUserService.insert(user);
         // 鎻掑叆骞冲彴鐢ㄦ埛
-        S_user_core userCore = new S_user_core();
-        userCore.setId(user.getSysUserId());
-        userCore.setDept_id(depts.get(0).getId()); // 閮ㄩ棬
-        userCore.setOrg_id(1L);
-        // userCore.setUser_name(); //鐢ㄦ埛璐﹀彿
-        userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
-        userCore.setNick_name(user.getUserName());
-        // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
-        userCore.setUser_type(2);
-
-        userCore.setPhonenumber(userPhone);
-        // 鍒濆鍖栧瘑鐮� 123456
-        String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
-        userCore.setPassword(pws);
-        if (user.getStatus() == 0) {
-            userCore.setStatus(1);
-        } else {
-            userCore.setStatus(0);
-        }
-        userCore.setDel_flag(0);
-        userCore.setCreate_by(this.getCurrentUser().getCreate_by());
-        userCore.setCreate_time(DateUtils.getDateTimeNumber());
-        userCore.setRemark(user.getRemark());
-        userCore.setType(1);
-        userCore.setBind_client_id("0");
-        userCore.setBind_wechat(0);
-        userCore.setModify_pwd(0);
-        userCore.setBind_mobile(0);
-        userCore.setBind_mail(0);
-        userCore.setProfile_id(0L);
-        userCore.setIs_wechat_public(0);
-        userCore.setIs_wechat_routine(0);
-        userCore.setIs_wechat_ios(0);
-        userCore.setIs_wechat_android(0);
-        userCore.setIs_logoff(0);
-        userCore.setLogoff_time(0L);
-        userCore.setIs_sms(0);
-        // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
+        S_user_core userCore = buildUpdateUserCore(user);
+        // 閮ㄩ棬
+        userCore.setDept_id(depts.get(0).getId());
         userCore.setType(2);
-        // 鍟嗘埛id锛�0-骞冲彴
-        userCore.setMer_id(0L);
         this.userService.insert(userCore);
         // 鎻掑叆骞冲彴鏈烘瀯
         // 灏戣鑹瞚d
@@ -799,7 +886,7 @@
         return ResponseValue.success(1);
     }
 
-    private Set<String> picFormatArr = new HashSet<String>() {
+    private final Set<String> picFormatArr = new HashSet<String>() {
         {
             add(".pjp");
             add(".svgz");
@@ -823,33 +910,28 @@
     @PostMapping("/updatePerson")
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue updatePerson() {
-        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
-        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
-        CommonUtil.copyProperties(user, finSysTenantParam);
-        user = finSysTenantParam;
-        if (user == null) {
+        FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+        CommonUtil.copyProperties(userParam, tenantUser);
+        userParam = tenantUser;
+        if (userParam == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         FinSysTenantUser sysInfo = getSysInfo();
         if (sysInfo == null) {
             return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        String avatar = user.getAvatar();
-        if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
+        String avatar = userParam.getAvatar();
+        if (StringUtils.isNotEmpty(avatar) && !picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
             return ResponseValue.error("澶村儚鏍煎紡涓嶅厑璁�");
         }
         FinSysTenantUser updUser = new FinSysTenantUser();
         updUser.setId(sysInfo.getId());
-        updUser.setAvatar(user.getAvatar());
-        updUser.setEmail(user.getEmail());
-        updUser.setUserName(user.getUserName());
-        updUser.setSex(user.getSex());
-        String encPhone = "";
-        if (user.getUserPhone() != null) {
-            String key = PlatformRSAUtils.AES_KEY;
-            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
-        }
-        updUser.setUserPhone(encPhone);
+        updUser.setAvatar(avatar);
+        updUser.setEmail(userParam.getEmail());
+        updUser.setUserName(userParam.getUserName());
+        updUser.setSex(userParam.getSex());
+        setUserPhone(updUser, userParam.getUserPhone());
         // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
         finSysTenantUserService.update(updUser);
         // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
@@ -929,9 +1011,9 @@
 
     @ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬涓殑鐢ㄦ埛", notes = "鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬涓殑鐢ㄦ埛")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
+            @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
     @GetMapping("/select/department")
-    public ResponseValue selectDepartment(Long agencyId) {
+    public ResponseValue selectDepartment(Long agencyId, String isFilter) {
         FinSysTenantVO finSysTenantVO = new FinSysTenantVO();
 
         FinSysTenant finSysTenant = new FinSysTenant();
@@ -943,8 +1025,9 @@
         // 閮ㄩ棬
         FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
         finSysTenantDepartment.setTenantId(agencyId);
-        List<FinSysTenantDepartment> tenantDepartmentList =
-            finSysTenantDepartmentService.select(finSysTenantDepartment);
+        finSysTenantDepartment.setStatus(StatesType.NORMAL.getValue());
+        finSysTenantDepartment.setIsDelete(0);
+        List<FinSysTenantDepartment> tenantDepartmentList = finSysTenantDepartmentService.select(finSysTenantDepartment);
         List<DepartmentVO> departmentVOList = Lists.newArrayList();
         tenantDepartmentList.forEach(department -> {
             DepartmentVO departmentVO = new DepartmentVO();
@@ -953,16 +1036,19 @@
             departmentVO.setId(id);
             departmentVO.setName(department.getName());
             departmentVO.setType("department");
-
-            String sql = "SELECT SYS_USER_ID,USER_NAME FROM " + "fin_sys_tenant_user "
-                + "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
+            String sql = "SELECT SYS_USER_ID,USER_NAME FROM fin_sys_tenant_user "
+                    + "WHERE STATUS =1 and SYS_DEPT_ID =:deptId ";
             Map<String, Object> param = new HashMap<>();
             param.put("deptId", id);
+            if ("1".equals(isFilter)) {
+                sql = "SELECT SYS_USER_ID,USER_NAME FROM fin_sys_tenant_user "
+                        + "WHERE STATUS =1 and SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
+            }
             List<Map<String, Object>> select = finSysTenantUserService.select(sql, param, new MapperUtil());
             List<UserVO> userVOList = Lists.newArrayList();
             select.forEach(user -> {
                 UserVO userVO = new UserVO();
-                userVO.setId((Long)user.get("sysUserId"));
+                userVO.setId((Long) user.get("sysUserId"));
                 userVO.setName(user.get("userName").toString());
                 userVO.setType("user");
                 userVOList.add(userVO);
@@ -975,4 +1061,27 @@
         return ResponseValue.success(finSysTenantVO);
     }
 
+    @GetMapping("/query/role")
+    public ResponseValue pageList() {
+        RolePageParam roleParam = CommonUtil.getObjFromReq(RolePageParam.class);
+        RolePageParam param2 = new RolePageParam();
+        CommonUtil.copyProperties(roleParam, param2);
+        roleParam = param2;
+        if (roleParam != null && roleParam.getOrgId() > 0L) {
+            long orgId = 0L;
+            if (!this.isSupervisor()) {
+                orgId = this.getCurrentUser().getOrg_id();
+            } else {
+                orgId = roleParam.getOrgId();
+            }
+
+            FinSysTenantUser finSysTenantUser = this.getSysInfo();
+            Integer dataScope = finSysTenantUser.getLv();
+            GenericPager<S_role> pager = finSysTenantUserService.queryPageRoleList(orgId, roleParam.getStatus(),
+                    roleParam.getRoleName(), dataScope, roleParam.getPageNum(), roleParam.getPageSize());
+            return ResponseValue.success(pager);
+        } else {
+            return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
+        }
+    }
 }

--
Gitblit v1.9.1