Merge remote-tracking branch 'origin/master'

linkwe-api/src/main/java/com/linkwechat/controller/WeCustomerController.java

@@ -194,10 +194,9 @@ public class WeCustomerController extends BaseController {
      */
     @GetMapping("/findWeCustomerBaseInfo")
     public AjaxResult<WeCustomerDetailInfoVo> findWeCustomerBaseInfo(String externalUserid, String userId, @RequestParam(defaultValue = "0") Integer delFlag){
+        WeCustomerDetailInfoVo weCustomerDetail = weCustomerService.findWeCustomerDetail(externalUserid, userId, null);
 
-        return AjaxResult.success(
-                weCustomerService.findWeCustomerDetail(externalUserid,userId,null)
-        );
+        return AjaxResult.success(weCustomerDetail);
     }
 
 

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/domain/entity/QwComcodeDept.java

@@ -20,9 +20,7 @@ import java.util.Date;
  * @since 2023-11-27
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("QW_COMCODE_DEPT")
+@TableName("qw_comcode_dept")
 public class QwComcodeDept implements Serializable {
 
     private static final long serialVersionUID = 1L;

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/domain/entity/QwSysDict.java

@@ -17,9 +17,7 @@ import java.util.Date;
  * @since 2023-09-14
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("QW_SYS_DICT")
+@TableName("qw_sys_dict")
 public class QwSysDict implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -27,73 +25,73 @@ public class QwSysDict implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 字典类型
      */
-    @TableField("DICTTYPE")
+    @TableField("dicttype")
     private String dicttype;
 
     /**
      * 字典编码
      */
-    @TableField("DICTCODE")
+    @TableField("dictcode")
     private String dictcode;
 
     /**
      * 字典值
      */
-    @TableField("DICTVALUE")
+    @TableField("dictvalue")
     private String dictvalue;
 
     /**
      * 排序
      */
-    @TableField("DICTSORT")
+    @TableField("dictsort")
     private Long dictsort;
 
     /**
      * 状态 1有效 0无效
      */
-    @TableField("STATUS")
+    @TableField("status")
     private String status;
 
     /**
      * 创建时间
      */
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 创建人
      */
-    @TableField("CREATE_BY")
+    @TableField("createBy")
     private String createBy;
 
     /**
      * 是否默认（Y是 N否）
      */
-    @TableField("IS_DEFAULT")
+    @TableField("isDefault")
     private String isDefault;
 
     /**
      * 字典说明
      */
-    @TableField("DICTLABEL")
+    @TableField("dictlabel")
     private String dictlabel;
 
     /**
      * 备注
      */
-    @TableField("REMAKE")
+    @TableField("remake")
     private String remake;
 
     /**
      * 父级编码
      */
-    @TableField("PARENTDICTCODE")
+    @TableField("parentdictcode")
     private String parentdictcode;
 
 

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/domain/entity/QwUserDept.java

@@ -20,9 +20,7 @@ import java.util.Date;
  * @since 2023-10-23
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("QW_USER_DEPT")
+@TableName("qw_user_dept")
 public class QwUserDept implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -30,55 +28,55 @@ public class QwUserDept implements Serializable {
     /**
      * 用户ID(企业微信的用户ID)
      */
-    @TableId(value = "USER_ID",type = IdType.INPUT)
+    @TableId(value = "user_id",type = IdType.INPUT)
     private String userId;
 
     /**
      * 用户名称
      */
-    @TableField("USER_NAME")
+    @TableField("user_name")
     private String userName;
 
     /**
      * 归属机构(中煤机构)
      */
-    @TableField("COMCODE")
+    @TableField("comcode")
     private String comcode;
 
     /**
      * 是否有效
      */
-    @TableField("VALIDSTATUS")
+    @TableField("validstatus")
     private String validstatus;
 
     /**
      * 操作人
      */
-    @TableField("UPDATE_BY")
+    @TableField("update_by")
     private String updateBy;
 
     /**
      * 操作时间
      */
-    @TableField("UPDATE_DATE")
+    @TableField("update_date")
     private Date updateDate;
 
     /**
      * 创建人
      */
-    @TableField("CREATE_BY")
+    @TableField("create_by")
     private String createBy;
 
     /**
      * 创建时间
      */
-    @TableField("CREATE_DATE")
+    @TableField("create_date")
     private Date createDate;
 
     /**
      * 不查询的机构，多个机构以英文,拼接
      */
-    @TableField("COMCODE_NOTIN")
+    @TableField("comcode_notin")
     private String comcodeNotin;
 
 

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/service/impl/DictServiceImpl.java

@@ -17,6 +17,7 @@ import com.linkwechat.coal.modules.xxxt.system.mapper.QwSysDictMapper;
 import com.linkwechat.coal.modules.xxxt.system.mapper.QwUserDeptMapper;
 import com.linkwechat.coal.modules.xxxt.system.service.DictService;
 import com.linkwechat.coal.modules.xxxt.system.service.QwUserDeptService;
+import com.linkwechat.common.context.SecurityContextHolder;
 import com.linkwechat.common.core.domain.AjaxResult;
 import com.linkwechat.common.core.domain.entity.SysDept;
 import com.linkwechat.common.core.domain.entity.SysRole;
@@ -76,260 +77,260 @@ public class DictServiceImpl implements DictService {
      */
     @Override
     public AjaxResult<DictVo> select(DictDto dto) {
-        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-        // 查询配置机构
-        String comcode = qwUserDeptService.selectByUserid();
-
-        QwUserDept userDept = qwUserDeptMapper.selectOne(new LambdaQueryWrapper<QwUserDept>().eq(QwUserDept::getUserId, sysUser.getUserId())
-                .eq(QwUserDept::getValidstatus, "1"));
-        // 车牌单独处理下再查询
-        if (StringUtils.isNotBlank(dto.getComcode()) && "LISENSENO".equalsIgnoreCase(dto.getDicttype())) {
-            dto.setDfComcode(dto.getComcode().length() > 2 ? dto.getComcode().substring(0, 2) : dto.getComcode());
-        }
-        List<DictVo> dictList = qwSysDictMapper.select(dto);
-        if (CollectionUtils.isEmpty(dictList)) {
-            switch (dto.getDicttype().toUpperCase()) {
-                case "QW_BY_DEPTID_GET_CHILD_USERID":
-                    if (sysUser.getUserId().equals(UserConstant.USERID)) {
-                        dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(Lists.newArrayList(sysUser.getDeptId()+""), Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "", UserConstant.ROLE_9+ ""));
-                    }else {
-                        List<SysRole> roles = sysUser.getRoles();
-                        if (!CollectionUtils.isEmpty(roles)) {
-                            List<Long> collect = roles.stream().map(role -> role.getRoleId()).collect(Collectors.toList());
-                            List<String> allDeptId = sysUserService.getAllDeptId(true, true, true, false);
-
-                            // 查询当前登录人的角色，如果是二级续保管理员，查询当前机构下的所有
-                            if (collect.contains(UserConstant.ROLE_14)) {
-                                //获取token的deptid
-                                List<String> list = Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "");
-                                dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(allDeptId, list);
-                            }else if (collect.contains(UserConstant.ROLE_9)){
-                                //获取token的deptid
-                                List<String> list = Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "", UserConstant.ROLE_9+ "");
-                                dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(allDeptId, list);
-                            }else if (collect.contains(UserConstant.ROLE_10)){
-                                //获取token的deptid
-                                DictVo dictVo = new DictVo();
-                                dictVo.setDicttype("QW_BY_DEPTID_GET_CHILD_USERID");
-                                dictVo.setDictcode(sysUser.getUserId()+"");
-                                dictVo.setDictvalue(sysUser.getUserName());
-                                dictList = new ArrayList<>();
-                                dictList.add(dictVo);
-                            }
-                        }
-                    }
-
-
-                    System.out.println("-------转换输出json结果-------");
-                    System.out.println(JSON.toJSON(dictList));
-                    break;
-                case "DEPT":
-//                    4	    公司总部        取第3层或第4层
-//                    3007	个人代理        取第3层或第4层
-//                    3026	业务员          取第3层或第4层
-//                    3104	专业代理        取第3层或第4层
-                    dictList = getDictVos(sysUser.getDept());
-                    // 最终的集合
-                    List<String> finalList = new ArrayList<>();
-
-                    String deptIds = sysUser.getDeptIds();
-                    List<String> list = Arrays.asList(deptIds.split(","));
-                    finalList.addAll(list);
-                    for (String deptId : list) {
-                        List<String> list3 = sysDeptMapper.selectByDeptId(deptId);
-                        finalList.addAll(list3);
-                    }
-
-                    // 已经映射机构的
-                    if (!CollectionUtils.isEmpty(finalList)) {
-                        one:
-                        for (String deptId : finalList) {
-                            if ((sysUser.getDeptId() + "").equals(deptId)) {
-                                continue;
-                            }
-                            SysDept sysDept = sysDeptService.selectBydeptId(deptId);
-                            if (!Objects.isNull(sysDept)) {
-                                List<DictVo> dictList1 = getDictVos(sysDept);
-                                if (CollectionUtils.isEmpty(dictList)) {
-                                    dictList = new ArrayList<>();
-                                }
-                                dictList.addAll(dictList1);
-                            }
-                        }
-                    }
-
-                    Set<String> seenCodes = new HashSet<>();
-
-                    deduplicateChildLists(dictList, seenCodes);
-
-
-                    System.out.println("-------转换输出json结果-------");
-                    System.out.println(JSON.toJSON(dictList));
-                    break;
-                case "COMCODE":
-                    DictVo vo = null;
-                    if (StringUtils.isNotBlank(comcode)) {
-                        dto.setDictcode(comcode);
-                        // 查询父节点
-                        DictDto dto1 = new DictDto();
-                        dto1.setComcode(comcode);
-                        dto1.setDicttype(dto.getDicttype());
-                        vo = dictMapper.selectParentcomcode(dto1);
-                    } else {
-                        throw new SystemException("该用户未配置归属机构！");
-                    }
-
-                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
-                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
-                        dto.setComcodeNotin(collect);
-                    }
-                    List<DictVo> sacompanies = dictMapper.selectSacompany(dto);
-                    if (vo != null) {
-                        sacompanies.add(vo);
-                        // 设置父节点
-                        dto.setDictcode(vo.getDictcode());
-                    } else {
-                        if (StringUtils.isNotBlank(comcode)) {
-                            if (DeptConstant.COMCODE_00.equals(comcode)) {
-                                // 总公司时设置父节点
-                                dto.setDictcode(DeptConstant.COMCODE_1);
-                            }
-                        }
-                    }
-                    //获取父节点数据
-                    dictList = sacompanies.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
-                            (m) -> {
-                                m.setChildList(getChildrens(m, sacompanies));
-                                return m;
-                            }
-                    ).collect(Collectors.toList());
-                    System.out.println("-------转换输出json结果-------");
-                    System.out.println(JSON.toJSON(dictList));
-                    break;
-                case "COM3CODE":
-                    DictVo vo3 = null;
-                    if (StringUtils.isNotBlank(comcode)) {
-                        dto.setDictcode(comcode);
-                        // 查询父节点
-                        DictDto dto1 = new DictDto();
-                        dto1.setComcode(comcode);
-                        dto1.setDicttype(dto.getDicttype());
-                        vo3 = dictMapper.selectParentcomcode(dto1);
-                    } else {
-                        throw new SystemException("该用户未配置归属机构！");
-                    }
-                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
-                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
-                        dto.setComcodeNotin(collect);
-                    }
-
-                    List<DictVo> sacompanies3 = dictMapper.selectSacompanyLength3Level(dto);
-                    if (vo3 != null) {
-                        sacompanies3.add(vo3);
-                        // 设置父节点
-                        dto.setDictcode(vo3.getDictcode());
-                    } else {
-                        if (StringUtils.isNotBlank(comcode)) {
-                            if (DeptConstant.COMCODE_00.equals(comcode)) {
-                                // 总公司时设置父节点
-                                dto.setDictcode(DeptConstant.COMCODE_1);
-                            }
-                        }
-                    }
-                    //获取父节点数据
-                    dictList = sacompanies3.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
-                            (m) -> {
-                                m.setChildList(getChildrens(m, sacompanies3));
-                                return m;
-                            }
-                    ).collect(Collectors.toList());
-                    System.out.println("-------转换输出json结果-------");
-                    System.out.println(JSON.toJSON(dictList));
-                    break;
-                case "RISKCODE":
-                    // 查询的是销管表中的险种编码
-                    dictList = dictMapper.selectPrpdrisk(dto);
-                    break;
-                case "AGENT":
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("查询中介时，请先选择机构！");
-                    }
-                    dictList = dictMapper.selectPrpdagentNew(dto);
-                    break;
-                case "POINT":
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("查询网点时，请先选择机构！");
-                    }
-                    dictList = dictMapper.selectPrpdnetpointNew(dto);
-                    break;
-                case "AGENTSALES":
-                    // 查询的是销管的中介表
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("查询代理时，请先选择机构！");
-                    }
-                    dictList = dictMapper.selectPrpdagentSales(dto);
-                    break;
-                case "POINTSALES":
-                    // 查询的是销管的网点表
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("查询网点时，请先选择机构！");
-                    }
-                    dictList = dictMapper.selectPrpdnetpointSales(dto);
-
-                    break;
-                case "USERCODE":
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("查询业务员时，请先选择机构！");
-                    }
-                    if (dto.getComcode().length() != 8) {
-                        throw new SystemException("查询业务员时，机构编码必须为8位机构");
-                    }
-                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
-                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
-                        dto.setComcodeNotin(collect);
-                    }
-                    dictList = dictMapper.selectSauser(dto);
-                    break;
-                case "USERANDPOINT":
-                    if (StringUtils.isEmpty(dto.getComcode())) {
-                        throw new SystemException("请先选择机构！");
-                    }
-                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
-                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
-                        dto.setComcodeNotin(collect);
-                    }
-                    dictList = dictMapper.selectSauser(dto);
-                    dictList.addAll(dictMapper.selectPrpdnetpoint(dto));
-                    break;
-                case "NEWCARUSETYPE":  // 车辆用途
-                    dictList = dictMapper.cxDblinkDict("CarUseTypeNew", "NEWCARUSETYPE");
-                    break;
-                case "NEWCARKIND":  // 车辆大类
-                    dictList = dictMapper.cxDblinkDict("MotorTypeNew", "NEWCARKIND");
-                    break;
-                case "NEWCARKINDSUB":  // 车辆细类
-                    dictList = dictMapper.cxDblinkDict("CarkindSub", "NEWCARKINDSUB");
-                    break;
-                case "POLICYYEAR2":
-                    // 保单年度
-                    // 查询当前时间年的前5年和后5年
-                    int nowYear = DateUtils.getNowYear();
-                    for (int i = nowYear - 5; i <= nowYear + 5; i++) {
-                        DictVo dictVo = new DictVo();
-                        dictVo.setDicttype("POLICYYEAR2");
-                        dictVo.setDictcode(i+"");
-                        dictVo.setDictvalue(i+"");
-                        dictVo.setIsDefault( i == nowYear ? "Y" : "N");
-                        dictList.add(dictVo);
-                    }
-                    break;
-                default:
-                    throw new SystemException("不被支持的字典类型！");
-            }
-        }
-
-
-        return AjaxResult.success(dictList);
+//        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+//        // 查询配置机构
+//        String comcode = qwUserDeptService.selectByUserid();
+//
+//        QwUserDept userDept = qwUserDeptMapper.selectOne(new LambdaQueryWrapper<QwUserDept>().eq(QwUserDept::getUserId, sysUser.getUserId())
+//                .eq(QwUserDept::getValidstatus, "1"));
+//        // 车牌单独处理下再查询
+//        if (StringUtils.isNotBlank(dto.getComcode()) && "LISENSENO".equalsIgnoreCase(dto.getDicttype())) {
+//            dto.setDfComcode(dto.getComcode().length() > 2 ? dto.getComcode().substring(0, 2) : dto.getComcode());
+//        }
+//        List<DictVo> dictList = qwSysDictMapper.select(dto);
+//        if (CollectionUtils.isEmpty(dictList)) {
+//            switch (dto.getDicttype().toUpperCase()) {
+//                case "QW_BY_DEPTID_GET_CHILD_USERID":
+//                    if (sysUser.getUserId().equals(UserConstant.USERID)) {
+//                        dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(Lists.newArrayList(sysUser.getDeptId()+""), Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "", UserConstant.ROLE_9+ ""));
+//                    }else {
+//                        List<SysRole> roles = sysUser.getRoles();
+//                        if (!CollectionUtils.isEmpty(roles)) {
+//                            List<Long> collect = roles.stream().map(role -> role.getRoleId()).collect(Collectors.toList());
+//                            List<String> allDeptId = sysUserService.getAllDeptId(true, true, true, false);
+//
+//                            // 查询当前登录人的角色，如果是二级续保管理员，查询当前机构下的所有
+//                            if (collect.contains(UserConstant.ROLE_14)) {
+//                                //获取token的deptid
+//                                List<String> list = Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "");
+//                                dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(allDeptId, list);
+//                            }else if (collect.contains(UserConstant.ROLE_9)){
+//                                //获取token的deptid
+//                                List<String> list = Lists.newArrayList(UserConstant.ROLE_14 + "", UserConstant.ROLE_10+ "", UserConstant.ROLE_9+ "");
+//                                dictList = sysUserMapper.selectByDeptIdGetIdNameChildList(allDeptId, list);
+//                            }else if (collect.contains(UserConstant.ROLE_10)){
+//                                //获取token的deptid
+//                                DictVo dictVo = new DictVo();
+//                                dictVo.setDicttype("QW_BY_DEPTID_GET_CHILD_USERID");
+//                                dictVo.setDictcode(sysUser.getUserId()+"");
+//                                dictVo.setDictvalue(sysUser.getUserName());
+//                                dictList = new ArrayList<>();
+//                                dictList.add(dictVo);
+//                            }
+//                        }
+//                    }
+//
+//
+//                    System.out.println("-------转换输出json结果-------");
+//                    System.out.println(JSON.toJSON(dictList));
+//                    break;
+//                case "DEPT":
+////                    4	    公司总部        取第3层或第4层
+////                    3007	个人代理        取第3层或第4层
+////                    3026	业务员          取第3层或第4层
+////                    3104	专业代理        取第3层或第4层
+//                    dictList = getDictVos(sysUser.getDept());
+//                    // 最终的集合
+//                    List<String> finalList = new ArrayList<>();
+//
+//                    String deptIds = sysUser.getDeptIds();
+//                    List<String> list = Arrays.asList(deptIds.split(","));
+//                    finalList.addAll(list);
+//                    for (String deptId : list) {
+//                        List<String> list3 = sysDeptMapper.selectByDeptId(deptId);
+//                        finalList.addAll(list3);
+//                    }
+//
+//                    // 已经映射机构的
+//                    if (!CollectionUtils.isEmpty(finalList)) {
+//                        one:
+//                        for (String deptId : finalList) {
+//                            if ((sysUser.getDeptId() + "").equals(deptId)) {
+//                                continue;
+//                            }
+//                            SysDept sysDept = sysDeptService.selectBydeptId(deptId);
+//                            if (!Objects.isNull(sysDept)) {
+//                                List<DictVo> dictList1 = getDictVos(sysDept);
+//                                if (CollectionUtils.isEmpty(dictList)) {
+//                                    dictList = new ArrayList<>();
+//                                }
+//                                dictList.addAll(dictList1);
+//                            }
+//                        }
+//                    }
+//
+//                    Set<String> seenCodes = new HashSet<>();
+//
+//                    deduplicateChildLists(dictList, seenCodes);
+//
+//
+//                    System.out.println("-------转换输出json结果-------");
+//                    System.out.println(JSON.toJSON(dictList));
+//                    break;
+//                case "COMCODE":
+////                    DictVo vo = null;
+////                    if (StringUtils.isNotBlank(comcode)) {
+////                        dto.setDictcode(comcode);
+////                        // 查询父节点
+////                        DictDto dto1 = new DictDto();
+////                        dto1.setComcode(comcode);
+////                        dto1.setDicttype(dto.getDicttype());
+////                        vo = dictMapper.selectParentcomcode(dto1);
+////                    } else {
+////                        throw new SystemException("该用户未配置归属机构！");
+////                    }
+////
+////                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
+////                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
+////                        dto.setComcodeNotin(collect);
+////                    }
+////                    List<DictVo> sacompanies = dictMapper.selectSacompany(dto);
+////                    if (vo != null) {
+////                        sacompanies.add(vo);
+////                        // 设置父节点
+////                        dto.setDictcode(vo.getDictcode());
+////                    } else {
+////                        if (StringUtils.isNotBlank(comcode)) {
+////                            if (DeptConstant.COMCODE_00.equals(comcode)) {
+////                                // 总公司时设置父节点
+////                                dto.setDictcode(DeptConstant.COMCODE_1);
+////                            }
+////                        }
+////                    }
+////                    //获取父节点数据
+////                    dictList = sacompanies.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
+////                            (m) -> {
+////                                m.setChildList(getChildrens(m, sacompanies));
+////                                return m;
+////                            }
+////                    ).collect(Collectors.toList());
+////                    System.out.println("-------转换输出json结果-------");
+////                    System.out.println(JSON.toJSON(dictList));
+//                    break;
+//                case "COM3CODE":
+//                    DictVo vo3 = null;
+//                    if (StringUtils.isNotBlank(comcode)) {
+//                        dto.setDictcode(comcode);
+//                        // 查询父节点
+//                        DictDto dto1 = new DictDto();
+//                        dto1.setComcode(comcode);
+//                        dto1.setDicttype(dto.getDicttype());
+//                        vo3 = dictMapper.selectParentcomcode(dto1);
+//                    } else {
+//                        throw new SystemException("该用户未配置归属机构！");
+//                    }
+//                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
+//                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
+//                        dto.setComcodeNotin(collect);
+//                    }
+//
+//                    List<DictVo> sacompanies3 = dictMapper.selectSacompanyLength3Level(dto);
+//                    if (vo3 != null) {
+//                        sacompanies3.add(vo3);
+//                        // 设置父节点
+//                        dto.setDictcode(vo3.getDictcode());
+//                    } else {
+//                        if (StringUtils.isNotBlank(comcode)) {
+//                            if (DeptConstant.COMCODE_00.equals(comcode)) {
+//                                // 总公司时设置父节点
+//                                dto.setDictcode(DeptConstant.COMCODE_1);
+//                            }
+//                        }
+//                    }
+//                    //获取父节点数据
+//                    dictList = sacompanies3.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
+//                            (m) -> {
+//                                m.setChildList(getChildrens(m, sacompanies3));
+//                                return m;
+//                            }
+//                    ).collect(Collectors.toList());
+//                    System.out.println("-------转换输出json结果-------");
+//                    System.out.println(JSON.toJSON(dictList));
+//                    break;
+//                case "RISKCODE":
+//                    // 查询的是销管表中的险种编码
+//                    dictList = dictMapper.selectPrpdrisk(dto);
+//                    break;
+//                case "AGENT":
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("查询中介时，请先选择机构！");
+//                    }
+//                    dictList = dictMapper.selectPrpdagentNew(dto);
+//                    break;
+//                case "POINT":
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("查询网点时，请先选择机构！");
+//                    }
+//                    dictList = dictMapper.selectPrpdnetpointNew(dto);
+//                    break;
+//                case "AGENTSALES":
+//                    // 查询的是销管的中介表
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("查询代理时，请先选择机构！");
+//                    }
+//                    dictList = dictMapper.selectPrpdagentSales(dto);
+//                    break;
+//                case "POINTSALES":
+//                    // 查询的是销管的网点表
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("查询网点时，请先选择机构！");
+//                    }
+//                    dictList = dictMapper.selectPrpdnetpointSales(dto);
+//
+//                    break;
+//                case "USERCODE":
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("查询业务员时，请先选择机构！");
+//                    }
+//                    if (dto.getComcode().length() != 8) {
+//                        throw new SystemException("查询业务员时，机构编码必须为8位机构");
+//                    }
+//                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
+//                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
+//                        dto.setComcodeNotin(collect);
+//                    }
+//                    dictList = dictMapper.selectSauser(dto);
+//                    break;
+//                case "USERANDPOINT":
+//                    if (StringUtils.isEmpty(dto.getComcode())) {
+//                        throw new SystemException("请先选择机构！");
+//                    }
+//                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
+//                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
+//                        dto.setComcodeNotin(collect);
+//                    }
+//                    dictList = dictMapper.selectSauser(dto);
+//                    dictList.addAll(dictMapper.selectPrpdnetpoint(dto));
+//                    break;
+//                case "NEWCARUSETYPE":  // 车辆用途
+//                    dictList = dictMapper.cxDblinkDict("CarUseTypeNew", "NEWCARUSETYPE");
+//                    break;
+//                case "NEWCARKIND":  // 车辆大类
+//                    dictList = dictMapper.cxDblinkDict("MotorTypeNew", "NEWCARKIND");
+//                    break;
+//                case "NEWCARKINDSUB":  // 车辆细类
+//                    dictList = dictMapper.cxDblinkDict("CarkindSub", "NEWCARKINDSUB");
+//                    break;
+//                case "POLICYYEAR2":
+//                    // 保单年度
+//                    // 查询当前时间年的前5年和后5年
+//                    int nowYear = DateUtils.getNowYear();
+//                    for (int i = nowYear - 5; i <= nowYear + 5; i++) {
+//                        DictVo dictVo = new DictVo();
+//                        dictVo.setDicttype("POLICYYEAR2");
+//                        dictVo.setDictcode(i+"");
+//                        dictVo.setDictvalue(i+"");
+//                        dictVo.setIsDefault( i == nowYear ? "Y" : "N");
+//                        dictList.add(dictVo);
+//                    }
+//                    break;
+//                default:
+//                    throw new SystemException("不被支持的字典类型！");
+//            }
+//        }
+
+
+        return AjaxResult.success(null);
     }
 
     private List<DictVo> getDictVos(SysDept dept) {

linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwComcodeDeptMapper.xml

@@ -24,14 +24,6 @@
         SELECT <include refid="Base_Column_List"/>
         FROM QW_COMCODE_DEPT A
         WHERE A.COMCODE=#{comcode}
-        AND A.COMCODE IN (
-            select comcode
-            from SaCompany@dblink_sales
-            where validstatus = '1'
-            start with comcode = #{dfComcode}
-            connect by prior comcode = uppercomcode
-            and prior comcode != comcode
-        )
     </select>
     <select id="selectByDeptIdLike" resultType="com.linkwechat.coal.modules.xxxt.system.domain.entity.QwComcodeDept">
         SELECT <include refid="Base_Column_List"/>

linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwSysDictMapper.xml

@@ -4,34 +4,34 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.linkwechat.coal.modules.xxxt.system.domain.entity.QwSysDict">
-        <id column="ID" property="id" />
-        <result column="DICTTYPE" property="dicttype" />
-        <result column="DICTCODE" property="dictcode" />
-        <result column="DICTVALUE" property="dictvalue" />
-        <result column="DICTSORT" property="dictsort" />
-        <result column="STATUS" property="status" />
-        <result column="CREATE_TIME" property="createTime" />
-        <result column="CREATE_BY" property="createBy" />
-        <result column="IS_DEFAULT" property="isDefault" />
-        <result column="DICTLABEL" property="dictlabel" />
-        <result column="REMAKE" property="remake" />
-        <result column="PARENTDICTCODE" property="parentdictcode" />
+        <id column="id" property="id" />
+        <result column="dicttype" property="dicttype" />
+        <result column="dictcode" property="dictcode" />
+        <result column="dictvalue" property="dictvalue" />
+        <result column="dictsort" property="dictsort" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="is_default" property="isDefault" />
+        <result column="dictlabel" property="dictlabel" />
+        <result column="remake" property="remake" />
+        <result column="parentdictcode" property="parentdictcode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, DICTTYPE, DICTCODE, DICTVALUE, DICTSORT, STATUS, CREATE_TIME, CREATE_BY, IS_DEFAULT, DICTLABEL, REMAKE, PARENTDICTCODE
+        id, dicttype, dictcode, dictvalue, dictsort, status, create_time, create_by, is_default, dictlabel, remake, parentdictcode
     </sql>
     <select id="select" resultType="com.linkwechat.coal.modules.xxxt.system.domain.vo.DictVo">
         SELECT
             <include refid="Base_Column_List"/>,
-            (DICTCODE||'--'||DICTVALUE) as codevalue,
-            IS_DEFAULT as  isDefault
-        FROM QW_SYS_DICT
+            (dictcode||'--'||dictvalue) as codevalue,
+            is_default as  isDefault
+        FROM qw_sys_dict
         <where>
-            STATUS = '1'
+            status = '1'
             <if test="dicttype != null and dicttype !=''">
-                AND DICTTYPE = UPPER(#{dicttype})
+                AND dicttype = UPPER(#{dicttype})
             </if>
             <if test="dictvalue != null and dictvalue !=''">
                 AND dictvalue LIKE '%' || #{dictvalue} || '%'
@@ -39,27 +39,27 @@
             <if test="parentdictcode != null and parentdictcode !=''">
                 AND parentdictcode = #{parentdictcode}
             </if>
-            <if test="dfComcode != null and dfComcode !=''">
-                AND parentdictcode in(
-                    Select comcode
-                    from saCompany@dblink_sales
-                    Start With comcode = #{dfComcode,jdbcType=VARCHAR}
-                    Connect By Prior comcode = uppercomcode
-                    and prior comcode != comcode
-                    and validstatus = '1')
+<!--            <if test="dfComcode != null and dfComcode !=''">-->
+<!--                AND parentdictcode in(-->
+<!--                    Select comcode-->
+<!--                    from saCompany@dblink_sales-->
+<!--                    Start With comcode = #{dfComcode,jdbcType=VARCHAR}-->
+<!--                    Connect By Prior comcode = uppercomcode-->
+<!--                    and prior comcode != comcode-->
+<!--                    and validstatus = '1')-->
 
-            </if>
+<!--            </if>-->
         </where>
-        ORDER BY DICTSORT ASC
+        ORDER BY dictsort ASC
     </select>
     <select id="selectAll" resultType="com.linkwechat.coal.modules.xxxt.system.domain.vo.DictVo">
         SELECT
         <include refid="Base_Column_List"/>,
-        (DICTCODE||'--'||DICTVALUE) as codevalue,
-        IS_DEFAULT as  isDefault
-        FROM QW_SYS_DICT
-        where STATUS = '1'
-        ORDER BY DICTTYPE,DICTSORT ASC
+        (dictcode||'--'||dictvalue) as codevalue,
+        is_default as isDefault
+        FROM qw_sys_dict
+        where status = '1'
+        ORDER BY dicttype,dictsort ASC
     </select>
 
 </mapper>

linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwUserDeptMapper.xml

@@ -4,24 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.linkwechat.coal.modules.xxxt.system.domain.entity.QwUserDept">
-        <result column="USER_ID" property="userId" />
-        <result column="USER_NAME" property="userName" />
-        <result column="COMCODE" property="comcode" />
-        <result column="VALIDSTATUS" property="validstatus" />
-        <result column="UPDATE_BY" property="updateBy" />
-        <result column="UPDATE_DATE" property="updateDate" />
-        <result column="CREATE_BY" property="createBy" />
-        <result column="CREATE_DATE" property="createDate" />
+        <result column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+        <result column="comcode" property="comcode" />
+        <result column="validstatus" property="validstatus" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_date" property="updateDate" />
+        <result column="create_by" property="createBy" />
+        <result column="create_date" property="createDate" />
+        <result column="comcode_notin" property="comcodeNotin" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        USER_ID, USER_NAME, COMCODE, VALIDSTATUS, UPDATE_BY, UPDATE_DATE, CREATE_BY, CREATE_DATE
+        user_id, user_name, comcode, validstatus, update_by, update_date, create_by, create_date,comcode_notin
     </sql>
     <select id="selectCom" resultType="java.util.Map">
-        SELECT a.COMCODE,b.COMCNAME
-        from QW_USER_DEPT a
-        join SaCompany@dblink_sales b on a.comcode=b.comcode
-        where a.user_id=#{userId}
+        SELECT a.comcode
+        from qw_user_dept a
     </select>
 </mapper>