futian.liu
2023-12-21 d80f3300905b7c4fffed59d8fa78491065aa181b
用户编号搜索和调拨明细只显示本机构及下级
4个文件已修改
15 ■■■■ 已修改文件
admin-web/src/views/systemManger/server/user/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/systemManger/server/user/items.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/systemManger/server/user/index.vue
@@ -58,9 +58,8 @@
      // 搜索条件
      filterFrom: {
        tenantCode: 0,
        trnantId: 0,
        userName: null,
        userPhone: null,
        userCode: null,
      },
      curOrgId: null,
      // 添加&编辑设置
@@ -292,7 +291,7 @@
    reset() {
      this.filterFrom.tenantCode = null;
      this.filterFrom.userName = null;
      this.filterFrom.userPhone = null;
      this.filterFrom.userCode = null;
      this.filterFrom.status = 1;
      this.search(1);
    },
admin-web/src/views/systemManger/server/user/items.js
@@ -8,7 +8,7 @@
  },
  {
    type: 'text',
    dataIndex: 'userPhone',
    dataIndex: 'userCode',
    label: '编号',
    placeholder: "请输入",
    defaultValue: ''
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -237,6 +237,8 @@
        if (sysInfo == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        String tenantId = sysInfo.getTenantId();
        param.setInAgencyId(Long.valueOf(tenantId));
        GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
        return ResponseValue.success(mapGenericPager);
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -644,11 +644,11 @@
        }
        if (param.getOutAgencyId() != null) {
            sql.append("AND ft.OUT_AGENCY_ID like :outAgencyId ");
            params.put("outAgencyId", param.getOutAgencyId());
            params.put("outAgencyId", param.getOutAgencyId() + StringUtils.CHAR_PERCENT);
        }
        if (param.getOutAgencyId() != null) {
        if (param.getInAgencyId() != null) {
            sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
            params.put("inAgencyId", param.getInAgencyId());
            params.put("inAgencyId", param.getInAgencyId() + StringUtils.CHAR_PERCENT);
        }
        if (StringUtils.isNotEmpty(param.getOperatorName())) {
            sql.append("AND ft.OPERATOR_NAME = :operatorName ");