From c5f0e74fef89532a7c5d2cca0db67a5101cf0d9b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 13:45:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/service/CstmrService.java | 2 +-
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 2 +-
src/main/webapp/static/js/cstmr/cstmr.js | 14 ++++++++++----
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 2 +-
src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 375d880..a4647f1 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -50,7 +50,7 @@
return R.ok(cstmrService.getPage(new Page<>(curr, limit)
, getHostId()
, String.valueOf(param.get("dept_id"))
- , param.get("condition"))
+ , condition)
);
} else {
return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
diff --git a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
index c054fc1..2f28610 100644
--- a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
@@ -17,6 +17,6 @@
Cstmr selectCstmrByNewestUuid(@Param("hostId") Long hostId);
- List<Cstmr> listByPage(Page page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("condition") Object condition);
+ List<Cstmr> listByPage(Page page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("condition") String condition);
}
diff --git a/src/main/java/com/zy/crm/manager/service/CstmrService.java b/src/main/java/com/zy/crm/manager/service/CstmrService.java
index e86f830..71dca4c 100644
--- a/src/main/java/com/zy/crm/manager/service/CstmrService.java
+++ b/src/main/java/com/zy/crm/manager/service/CstmrService.java
@@ -10,6 +10,6 @@
String getNextUuid(Long hostId);
- Page<Cstmr> getPage(Page page, Long hostId, String deptId, Object condition);
+ Page<Cstmr> getPage(Page page, Long hostId, String deptId, String condition);
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 484841b..4c71cb2 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -25,7 +25,7 @@
}
@Override
- public Page<Cstmr> getPage(Page page, Long hostId, String deptId, Object condition) {
+ public Page<Cstmr> getPage(Page page, Long hostId, String deptId, String condition) {
return page.setRecords(baseMapper.listByPage(page, hostId, deptId, condition));
}
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 1ad10e7..3432313 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -1,5 +1,6 @@
var pageCurr;
var pageCount = 0;
+var treeCond;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -27,7 +28,6 @@
// 鏍戝舰鍥�
var organizationTree;
- var selObj;
window.loadTree = function(condition){
var loadIndex = layer.load(2);
$.ajax({
@@ -46,7 +46,11 @@
onlyIconControl: true,
data: res.data,
click: function (obj) {
- selObj = obj;
+ treeCond = {
+ key: obj.data.key,
+ val: obj.data.id
+ }
+ // treeCond = {[obj.data.key]: obj.data.id};
$('#organizationTree').find('.ew-tree-click').removeClass('ew-tree-click');
$(obj.elem).children('.layui-tree-entry').addClass('ew-tree-click');
tableIns.reload({
@@ -297,8 +301,7 @@
itemHeight: '250px',
filterable: true,
onChange: function (values, data) {
- // console.log(values);
- // console.log(data);
+ // console.log(values);console.log(data);
}
});
}
@@ -316,6 +319,9 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ if (treeCond) {
+ searchData[treeCond.key] = treeCond.val;
+ }
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
--
Gitblit v1.9.1