From d9c5a848503c3181d582e5acb5256288a9917ae2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 09:13:19 +0800
Subject: [PATCH] #
---
src/main/webapp/views/user/user.html | 4 ++--
src/main/java/com/zy/crm/system/entity/User.java | 11 ++++++-----
src/main/webapp/static/js/user/user.js | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/entity/User.java b/src/main/java/com/zy/crm/system/entity/User.java
index 84e4621..8924465 100644
--- a/src/main/java/com/zy/crm/system/entity/User.java
+++ b/src/main/java/com/zy/crm/system/entity/User.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.HostService;
import com.zy.crm.system.service.RoleService;
@@ -125,11 +126,11 @@
}
public String getDeptName() {
-// DeptService service = SpringUtils.getBean(DeptService.class);
-// Dept dept = service.selectById(this.deptId);
-// if (!Cools.isEmpty(dept)){
-// return dept.getName();
-// }
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return dept.getName();
+ }
return null;
}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 86b838d..f58f6ae 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -23,7 +23,7 @@
height: 'full-100',
cols: [[
{type: 'checkbox'}
- ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
+ ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�', templet: '#deptTpl', width: 140}
// ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
,{field: 'username', align: 'center',title: '鐢ㄦ埛鍚�'}
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index 516ec24..aab7ffb 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -76,8 +76,8 @@
</div>
</div>
-<script type="text/html" id="hostTpl">
- <span name="hostName" class="layui-badge layui-badge-gray">{{d.hostName}}</span>
+<script type="text/html" id="deptTpl">
+ <span name="deptName" class="layui-badge layui-badge-gray">{{d.deptName}}</span>
</script>
<script type="text/html" id="statusTpl">
--
Gitblit v1.9.1