From 3640ae3908b0ad75baee22ba588e5cce4319e216 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 08:53:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/service/DeptService.java | 3 +--
src/main/java/com/zy/crm/common/web/BaseController.java | 2 +-
src/main/webapp/views/dept/dept.html | 6 +++---
src/main/java/com/zy/crm/system/service/impl/DeptServiceImpl.java | 8 ++++----
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/web/BaseController.java b/src/main/java/com/zy/crm/common/web/BaseController.java
index f157038..c8fdd34 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -111,7 +111,7 @@
}
protected Dept getOriginDept(){
- Dept dept = deptService.getTop();
+ Dept dept = deptService.getTop(getHostId());
if (dept == null) {
throw new CoolException("閮ㄩ棬鏁版嵁閿欒");
}
diff --git a/src/main/java/com/zy/crm/system/service/DeptService.java b/src/main/java/com/zy/crm/system/service/DeptService.java
index caebb94..0a773c9 100644
--- a/src/main/java/com/zy/crm/system/service/DeptService.java
+++ b/src/main/java/com/zy/crm/system/service/DeptService.java
@@ -1,12 +1,11 @@
package com.zy.crm.system.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.crm.manager.entity.Node;
import com.zy.crm.system.entity.Dept;
public interface DeptService extends IService<Dept> {
- Dept getTop();
+ Dept getTop(Long hostId);
int getMemberCount(Long deptId);
diff --git a/src/main/java/com/zy/crm/system/service/impl/DeptServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/DeptServiceImpl.java
index d78c883..cef6de0 100644
--- a/src/main/java/com/zy/crm/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/DeptServiceImpl.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
-import com.zy.crm.manager.entity.Node;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.mapper.DeptMapper;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import java.util.Date;
@@ -20,10 +19,11 @@
private UserService userService;
@Override
- public Dept getTop() {
+ public Dept getTop(Long hostId) {
Dept top = this.selectOne(new EntityWrapper<Dept>().eq("level", 0));
if (top == null) {
top = new Dept();
+ top.setHostId(hostId);
top.setName("鍏ㄩ儴");
top.setUuid("鍏ㄩ儴");
top.setLevel(0);
diff --git a/src/main/webapp/views/dept/dept.html b/src/main/webapp/views/dept/dept.html
index ce85e9f..4b1f142 100644
--- a/src/main/webapp/views/dept/dept.html
+++ b/src/main/webapp/views/dept/dept.html
@@ -155,13 +155,13 @@
,{type: 'numbers'}
,{field: 'name', align: 'left',title: '鍚嶇О', minWidth: 150}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- ,{field: 'type$', align: 'center',title: '绫诲瀷'}
- ,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
+ ,{field: 'email', align: 'center',title: '閭'}
+ ,{field: 'phone', align: 'center',title: '鑱旂郴鐢佃瘽'}
,{field: 'img', align: 'center',title: '鍥剧墖', hide: true}
// ,{field: 'brief', align: 'center',title: '绠�瑕佹弿杩�'}
// ,{field: 'count', align: 'center',title: '鏁伴噺'}
,{field: 'sort', align: 'center',title: '鎺掑簭'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
--
Gitblit v1.9.1