From 1783ae33b2100cef5952778622b2a02dc7835f77 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 17 十二月 2025 13:13:14 +0800
Subject: [PATCH] #客户+部门

---
 src/main/webapp/views/client/client.html                          |   98 +++
 src/main/java/com/zy/system/entity/User.java                      |   18 
 src/main/java/com/zy/asrs/controller/ClientController.java        |  137 ++++
 src/main/java/client.sql                                          |   18 
 pom.xml                                                           |    2 
 src/main/java/com/zy/asrs/mapper/ClientMapper.java                |   12 
 src/main/java/department.sql                                      |   18 
 src/main/resources/application-dev.yml                            |    2 
 src/main/webapp/static/js/client/client.js                        |  261 ++++++++
 src/main/java/com/zy/asrs/service/DepartmentService.java          |    8 
 src/main/java/com/zy/asrs/service/impl/ClientServiceImpl.java     |   12 
 src/main/java/com/zy/asrs/service/impl/DepartmentServiceImpl.java |   12 
 src/main/webapp/static/js/common.js                               |    2 
 src/main/webapp/static/js/user/user.js                            |    6 
 src/main/java/com/zy/asrs/controller/DepartmentController.java    |  183 +++++
 src/main/java/com/zy/system/controller/UserController.java        |    3 
 src/main/java/com/zy/asrs/entity/Client.java                      |  106 +++
 src/main/java/com/zy/asrs/service/ClientService.java              |    8 
 src/main/resources/mapper/ClientMapper.xml                        |   17 
 src/main/java/com/zy/common/CodeBuilder.java                      |    6 
 src/main/webapp/static/js/department/department.js                |  261 ++++++++
 src/main/webapp/views/department/department.html                  |  398 ++++++++++++
 src/main/resources/mapper/DepartmentMapper.xml                    |   17 
 src/main/webapp/views/user/user.html                              |  104 +-
 src/main/java/com/zy/asrs/mapper/DepartmentMapper.java            |   12 
 src/main/java/com/zy/asrs/entity/Department.java                  |  136 ++++
 26 files changed, 1,796 insertions(+), 61 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6fbc0f6..1a00ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
     </dependencies>
 
     <build>
-        <finalName>yhfzwms</finalName>
+        <finalName>wms</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/client.sql b/src/main/java/client.sql
new file mode 100644
index 0000000..176d6a6
--- /dev/null
+++ b/src/main/java/client.sql
@@ -0,0 +1,18 @@
+-- save client record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client/client.html', 'client绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'client#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client/client.html', N'client绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'client#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/ClientController.java b/src/main/java/com/zy/asrs/controller/ClientController.java
new file mode 100644
index 0000000..95c399a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ClientController.java
@@ -0,0 +1,137 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.Client;
+import com.zy.asrs.service.ClientService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class ClientController extends BaseController {
+
+    @Autowired
+    private ClientService clientService;
+
+    @RequestMapping(value = "/client/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(clientService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/client/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<Client> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(Client.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(clientService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/client/add/auth")
+    @ManagerAuth
+    public R add(Client client) {
+        if (Cools.isEmpty(client)){
+            return R.error();
+        }
+        Date date = new Date();
+        client.setId(null);
+        client.setCreateTime(date);
+        client.setCreateBy(getUserId());
+        client.setUpdateTime(date);
+        client.setUpdateBy(getUserId());
+        clientService.insert(client);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/client/update/auth")
+	@ManagerAuth
+    public R update(Client client){
+        if (Cools.isEmpty(client) || null==client.getId()){
+            return R.error();
+        }
+        Date date = new Date();
+        client.setUpdateTime(date);
+        client.setUpdateBy(getUserId());
+        clientService.updateById(client);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/client/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            clientService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/client/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<Client> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("client"));
+        convert(map, wrapper);
+        List<Client> list = clientService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/clientQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<Client> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<Client> page = clientService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Client client : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", client.getId());
+            map.put("value", client.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/client/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<Client> wrapper = new EntityWrapper<Client>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != clientService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(Client.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/DepartmentController.java b/src/main/java/com/zy/asrs/controller/DepartmentController.java
new file mode 100644
index 0000000..7730f18
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/DepartmentController.java
@@ -0,0 +1,183 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Department;
+import com.zy.asrs.entity.Node;
+import com.zy.asrs.service.DepartmentService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.utils.NodeUtils;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class DepartmentController extends BaseController {
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @RequestMapping(value = "/department/list/tree/auth")
+    @ManagerAuth
+    public R listTree(@RequestParam(defaultValue = "1") Integer curr,
+            @RequestParam(defaultValue = "10") Integer limit,
+            @RequestParam(required = false) String orderByField,
+            @RequestParam(required = false) String orderByType,
+            @RequestParam Map<String, Object> param) {
+        EntityWrapper<Department> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        hostEq(wrapper);
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        }
+        return R.parse("0-鎿嶄綔鎴愬姛").add(departmentService.selectList(wrapper));
+    }
+
+    @RequestMapping(value = "/department/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(departmentService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/department/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1") Integer curr,
+            @RequestParam(defaultValue = "10") Integer limit,
+            @RequestParam(required = false) String orderByField,
+            @RequestParam(required = false) String orderByType,
+            @RequestParam(required = false) String condition,
+            @RequestParam Map<String, Object> param) {
+        EntityWrapper<Department> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(Department.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        }
+        return R.ok(departmentService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)) {
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/department/add/auth")
+    @ManagerAuth
+    public R add(Department department) {
+
+        Department department1 = departmentService
+                .selectOne(new EntityWrapper<Department>().eq("name", department.getName()));
+        if (!Cools.isEmpty(department1)) {
+            throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+        }
+        if (!Cools.isEmpty(department.getOrgId())) {
+            Department parentDepartment = departmentService.selectById(department.getOrgId());
+            if (parentDepartment == null) {
+                return R.error("鐖惰妭鐐逛笉瀛樺湪");
+            }
+            department.setOrgId(parentDepartment.getId());
+
+        }
+        departmentService.insert(department);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/department/update/auth")
+    @ManagerAuth
+    public R update(Department department) {
+        if (Cools.isEmpty(department) || null == department.getId()) {
+            return R.error();
+        }
+        Date date = new Date();
+        department.setUpdateTime(date);
+        department.setUpdateBy(getUserId());
+        departmentService.updateById(department);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/department/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+        for (Long id : ids) {
+            departmentService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/department/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param) {
+        EntityWrapper<Department> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("department"));
+        convert(map, wrapper);
+        List<Department> list = departmentService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/departmentQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<Department> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<Department> page = departmentService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Department department : page.getRecords()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", department.getId());
+            map.put("value", department.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/department/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<Department> wrapper = new EntityWrapper<Department>().eq(humpToLine(String.valueOf(param.get("key"))),
+                param.get("val"));
+        if (null != departmentService.selectOne(wrapper)) {
+            return R.parse(BaseRes.REPEAT).add(getComment(Department.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/deptQuery/auth")
+    @ManagerAuth
+    public R queryByName(String condition) {
+        EntityWrapper<Department> wrapper = new EntityWrapper<>();
+        if (!Cools.isEmpty(condition)) {
+            wrapper.like("name", condition);
+        }
+        Page<Department> page = departmentService.selectPage(new Page<>(0, 20), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Department department : page.getRecords()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", department.getId());
+            map.put("value", department.getName());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/Client.java b/src/main/java/com/zy/asrs/entity/Client.java
new file mode 100644
index 0000000..34a1433
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/Client.java
@@ -0,0 +1,106 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_client")
+public class Client implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value= "")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value= "")
+    private String code;
+
+    @ApiModelProperty(value= "")
+    private String name;
+
+    @ApiModelProperty(value= "")
+    @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("create_by")
+    private Long createBy;
+
+    @ApiModelProperty(value= "")
+    @TableField("update_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("update_by")
+    private Long updateBy;
+
+    public Client() {}
+
+
+
+//    Client client = new Client(
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getUpdateTime$(){
+        if (Cools.isEmpty(this.updateTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+    }
+
+    public String getCreateBy$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.createBy);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        if (this.createBy == 9527){
+            return "super";
+        }
+        return null;
+    }
+
+    public String getUpdateBy$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.updateBy);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        if (this.createBy == 9527){
+            return "super";
+        }
+        return null;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/Department.java b/src/main/java/com/zy/asrs/entity/Department.java
new file mode 100644
index 0000000..503bbb3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/Department.java
@@ -0,0 +1,136 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_department")
+public class Department implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 婧怚D
+     */
+    @ApiModelProperty(value= "婧怚D")
+    @TableField("org_id")
+    private Long orgId;
+
+    /**
+     * 鍚嶇О
+     */
+    @ApiModelProperty(value= "鍚嶇О")
+    private String name;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+    @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 鍒涘缓浜哄憳
+     */
+    @ApiModelProperty(value= "鍒涘缓浜哄憳")
+    @TableField("create_by")
+    private Long createBy;
+
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @ApiModelProperty(value= "鏇存柊鏃堕棿")
+    @TableField("update_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 鏇存柊浜哄憳
+     */
+    @ApiModelProperty(value= "鏇存柊浜哄憳")
+    @TableField("update_by")
+    private Long updateBy;
+
+    public Department() {}
+
+    public Department(Long orgId,String name,Date createTime,Long createBy,Date updateTime,Long updateBy) {
+        this.orgId = orgId;
+        this.name = name;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+    }
+
+//    Department department = new Department(
+//            null,    // 婧怚D
+//            null,    // 鍚嶇О
+//            null,    // 鍒涘缓鏃堕棿
+//            null,    // 鍒涘缓浜哄憳
+//            null,    // 鏇存柊鏃堕棿
+//            null    // 鏇存柊浜哄憳
+//    );
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getUpdateTime$(){
+        if (Cools.isEmpty(this.updateTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+    }
+
+    public String getCreateBy$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.createBy);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        if (this.createBy == 9527){
+            return "super";
+        }
+        return null;
+    }
+
+    public String getUpdateBy$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.updateBy);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        if (this.createBy == 9527){
+            return "super";
+        }
+        return null;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/ClientMapper.java b/src/main/java/com/zy/asrs/mapper/ClientMapper.java
new file mode 100644
index 0000000..ef333c6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/ClientMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.Client;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ClientMapper extends BaseMapper<Client> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/DepartmentMapper.java b/src/main/java/com/zy/asrs/mapper/DepartmentMapper.java
new file mode 100644
index 0000000..4679a60
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/DepartmentMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.Department;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DepartmentMapper extends BaseMapper<Department> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/ClientService.java b/src/main/java/com/zy/asrs/service/ClientService.java
new file mode 100644
index 0000000..d57c64e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/ClientService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.Client;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface ClientService extends IService<Client> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/DepartmentService.java b/src/main/java/com/zy/asrs/service/DepartmentService.java
new file mode 100644
index 0000000..506b406
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/DepartmentService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.Department;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface DepartmentService extends IService<Department> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ClientServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ClientServiceImpl.java
new file mode 100644
index 0000000..24e2397
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/ClientServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.ClientMapper;
+import com.zy.asrs.entity.Client;
+import com.zy.asrs.service.ClientService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("clientService")
+public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> implements ClientService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/DepartmentServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DepartmentServiceImpl.java
new file mode 100644
index 0000000..fe1b209
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/DepartmentServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.DepartmentMapper;
+import com.zy.asrs.entity.Department;
+import com.zy.asrs.service.DepartmentService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("departmentService")
+public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 0996236..bb4bc3f 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
 //        generator.table="sys_host";
         // sqlserver
         generator.sqlOsType = SqlOsType.SQL_SERVER;
-        generator.url = "127.0.0.1:1433;databasename=jsxswms";
+        generator.url = "192.168.4.15:1433;databasename=yhfzasrs";
         generator.username = "sa";
-        generator.password = "Skyouc#23";
-        generator.table = "asr_bas_container";
+        generator.password = "sa@123";
+        generator.table = "asr_department";
         generator.packagePath = "com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 1d32309..72b7101 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -117,6 +117,9 @@
         if (user.getMobile() != null) {
             entity.setMobile(user.getMobile());
         }
+        if (user.getDeptId() != null) {
+            entity.setDeptId(user.getDeptId());
+        }
         userService.updateById(entity);
         return R.ok();
     }
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index f04af64..1ebf235 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -6,6 +6,8 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.Department;
+import com.zy.asrs.service.DepartmentService;
 import com.zy.system.service.HostService;
 import com.zy.system.service.RoleService;
 
@@ -31,7 +33,6 @@
      */
     @TableField("host_id")
     private Long hostId;
-
 
     /**
      * 鎵�灞為儴闂�
@@ -76,7 +77,7 @@
     private String email;
 
     /**
-     * 鎬у埆 0: 鐢�  1:  濂�   2:  鏈煡
+     * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡
      */
     private Integer sex;
 
@@ -87,7 +88,7 @@
     private Date createTime;
 
     /**
-     * 鐘舵�� 1: 鍚敤  0: 绂佺敤
+     * 鐘舵�� 1: 鍚敤 0: 绂佺敤
      */
     private Integer status;
 
@@ -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();
-//        }
+        DepartmentService service = SpringUtils.getBean(DepartmentService.class);
+        Department dept = service.selectById(this.deptId);
+        if (!Cools.isEmpty(dept)) {
+            return dept.getName();
+        }
         return null;
     }
 
@@ -258,6 +259,5 @@
     public void setStatus(Integer status) {
         this.status = status;
     }
-
 
 }
diff --git a/src/main/java/department.sql b/src/main/java/department.sql
new file mode 100644
index 0000000..0a73c72
--- /dev/null
+++ b/src/main/java/department.sql
@@ -0,0 +1,18 @@
+-- save department record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department/department.html', 'department绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'department#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department/department.html', N'department绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'department#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4ec255d..b42861a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: sa
     password: sa@123
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=yhfzasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=yhfzasrs
   mvc:
     static-path-pattern: /**
   redis:
diff --git a/src/main/resources/mapper/ClientMapper.xml b/src/main/resources/mapper/ClientMapper.xml
new file mode 100644
index 0000000..ee61b06
--- /dev/null
+++ b/src/main/resources/mapper/ClientMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.ClientMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Client">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml
new file mode 100644
index 0000000..0317243
--- /dev/null
+++ b/src/main/resources/mapper/DepartmentMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.DepartmentMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Department">
+        <id column="id" property="id" />
+        <result column="org_id" property="orgId" />
+        <result column="name" property="name" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/client/client.js b/src/main/webapp/static/js/client/client.js
new file mode 100644
index 0000000..5969138
--- /dev/null
+++ b/src/main/webapp/static/js/client/client.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#client',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/client/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            // ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'code', align: 'center',title: '瀹㈡埛缂栫爜'}
+            ,{field: 'name', align: 'center',title: '瀹㈡埛鍚嶇О'}
+            // ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            // ,{field: 'createBy', align: 'center',title: '鍒涘缓浜哄憳'}
+            ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+            ,{field: 'updateBy$', align: 'center',title: '鏇存柊浜哄憳'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(client)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(client)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'client': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/client/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(client)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/client/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/client/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+            layDate.render({
+                elem: '#createTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['createTime\\$']:null
+            });
+            layDate.render({
+                elem: '#updateTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['updateTime\\$']:null
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 48196e3..5fbd480 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/yhfzwms";
+var baseUrl = "/wms";
 
 // 璇︽儏绐楀彛-楂樺害
 var detailHeight = '80%';
diff --git a/src/main/webapp/static/js/department/department.js b/src/main/webapp/static/js/department/department.js
new file mode 100644
index 0000000..eea2daa
--- /dev/null
+++ b/src/main/webapp/static/js/department/department.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#department',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/department/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'orgId', align: 'center',title: '婧怚D'}
+            ,{field: 'name', align: 'center',title: '鍚嶇О'}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            ,{field: 'createBy', align: 'center',title: '鍒涘缓浜哄憳'}
+            ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+            ,{field: 'updateBy', align: 'center',title: '鏇存柊浜哄憳'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(department)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(department)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'department': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/department/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(department)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/department/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/department/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+            layDate.render({
+                elem: '#createTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['createTime\\$']:null
+            });
+            layDate.render({
+                elem: '#updateTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['updateTime\\$']:null
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..7bb9f95 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -27,7 +27,7 @@
             // ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
             ,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
             ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
-            // ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
+            ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
             ,{field: 'roleName', align: 'center',title: '瑙掕壊'}
             ,{field: 'email', align: 'center',title: '閭'}
             // ,{field: 'sex$', align: 'center',title: '鎬у埆'}
@@ -139,6 +139,10 @@
                         layer.msg('璇烽�夋嫨瑙掕壊', {icon: 2});
                         return false;
                     }
+                    if (isEmpty(data.field.deptId)) {
+                        layer.msg('璇烽�夋嫨閮ㄩ棬', {icon: 2});
+                        return false;
+                    }
                     var loadIndex = layer.load(2);
                     $.ajax({
                         url: baseUrl+"/user/"+(mData?'update':'add')+"/auth",
diff --git a/src/main/webapp/views/client/client.html b/src/main/webapp/views/client/client.html
new file mode 100644
index 0000000..ae1158c
--- /dev/null
+++ b/src/main/webapp/views/client/client.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                     <div class="layui-inline" style="width: 300px">
+                        <div class="layui-input-inline">
+                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="client" lay-filter="client"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/client/client.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">瀹㈡埛缂栫爜: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="code" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">瀹㈡埛鍚嶇О: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="name" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/department/department.html b/src/main/webapp/views/department/department.html
new file mode 100644
index 0000000..d886cdb
--- /dev/null
+++ b/src/main/webapp/views/department/department.html
@@ -0,0 +1,398 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <style>
+        #detail {
+            padding: 25px 30px 0 0;
+        }
+        .ew-tree-table-box {
+            height: 100%;
+        }
+    </style>
+</head>
+<body>
+
+<!-- 姝ｆ枃寮�濮� -->
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <!-- 鏁版嵁琛ㄦ牸 -->
+            <table id="node"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container" style="width: 100%">
+        <button lay-event="add" class="layui-btn layui-btn-sm layui-btn-normal icon-btn"><i class="layui-icon">&#xe654;</i>娣诲姞</button>&nbsp;
+        <button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon">&#xe640;</i>鍒犻櫎</button>
+</script>
+
+<script type="text/html" id="typeTpl">
+    {{# if( d.type === 1){ }}
+    <span name="type" class="layui-badge layui-badge-red" ><span style="display: none">{{d.number}}</span>浠撳簱</span>
+    {{# } else if(d.type === 2){ }}
+    <span name="type" class="layui-badge layui-badge-blue" ><span style="display: none">{{d.number}}</span>搴撳尯</span>
+    {{# } else if(d.type === 3){ }}
+    <span name="type" class="layui-badge layui-badge-green" ><span style="display: none">{{d.number}}</span>璐т綅</span>
+    {{# } else { }}
+    <span name="type" class="layui-badge layui-badge-gray" ><span style="display: none">{{d.number}}</span>鍏朵粬</span>
+    {{# } }}
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-del" lay-event="del">鍒犻櫎</a>
+</script>
+
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form">
+        <input name="id" type="hidden">
+        <input name="uuid" type="hidden">
+        <input name="path" type="hidden">
+        <input name="pathName" type="hidden">
+        <input name="level" type="hidden">
+        <input name="sort" type="hidden">
+        <input name="leading" type="hidden">
+        <input name="barcode" type="hidden">
+        <input name="major" type="hidden">
+        <input name="createTime$" type="hidden">
+        <input name="createBy" type="hidden">
+        <input name="updateTime$" type="hidden">
+        <input name="updateBy" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">涓婄骇鑿滃崟</label>
+                    <div class="layui-input-block">
+                        <div id="nodeParentSel" class="ew-xmselect-tree"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">缂栧彿/鍚嶇О</label>
+                    <div class="layui-input-block">
+                        <input name="name" placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+<!-- 鎵撳嵃妯℃澘 -->
+<script type="text/template" id="locPrintTpl">
+    {{#each data}}
+    <img class="template-code" src="{{this.barcodeUrl}}" width="100%">
+    <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+        <span>{{this.item}}</span>
+    </div>
+    {{/each}}
+</script>
+<div id="printBox" style="display: none;"></div>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+
+<script>
+    var insTb;
+    var admin;
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).extend({
+        dropdown: 'dropdown/dropdown',
+    }).use(['form','treeTable', 'admin', 'xmSelect', 'dropdown', 'element'], function() {
+        var $ = layui.jquery;
+        var layer = layui.layer;
+        var form = layui.form;
+        admin = layui.admin;
+        var treeTable = layui.treeTable;
+        var xmSelect = layui.xmSelect;
+        var tbDataList = [];
+
+        insTb = treeTable.render({
+            elem: '#node',
+            url: baseUrl+'/department/list/tree/auth',
+            headers: {token: localStorage.getItem('token')},
+            height: 'full-200',
+            toolbar: '#toolbar',
+            tree: {
+                iconIndex: 2,           // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
+                isPidData: true,        // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
+                idName: 'id',           // id瀛楁鍚嶇О
+                pidName: 'orgId'     // pid瀛楁鍚嶇О
+            },
+            cols: [[
+                {type: 'checkbox'}
+                ,{type: 'numbers'}
+                ,{field: 'name', align: 'left',title: '缂栧彿/鍚嶇О', minWidth: 150}
+                // ,{field: 'uuid', left: 'center',title: '缂栧彿/鍚嶇О', minWidth: 150}
+                ,{field: 'type$', align: 'center',title: '绫诲瀷', templet: '#typeTpl'}
+                // ,{field: 'leading', 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: '鐘舵��', hide: true}
+                ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+                ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+                ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+
+                ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ]],
+            done: function (data) {
+                console.log(data)
+                $('.ew-tree-table-box').css('height', '100%');
+                insTb.expandAll();
+                tbDataList = data;
+            }
+        });
+
+        /* 琛ㄦ牸澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+        treeTable.on('toolbar(node)', function (obj) {
+            var checkRows = insTb.checkStatus();
+            if (obj.event === 'add') { // 娣诲姞
+                showEditModel();
+            } else if (obj.event === 'del') { // 鍒犻櫎
+                if (checkRows.length === 0) {
+                    layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                    return;
+                }
+                var ids = checkRows.map(function (d) {
+                    if (!d.LAY_INDETERMINATE) {
+                        return d.id;
+                    } else {
+                        return null;
+                    }
+                });
+                doDel({ids: ids});
+            } else if (obj.event === 'printBatch') {
+                if (checkRows.length === 0) {
+                    layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁', {icon: 2});
+                    return;
+                }
+                var printContent = checkRows.map(function (d) {
+                    if (!d.LAY_INDETERMINATE && d.type === 3) {
+                        return d.name;
+                    } else {
+                        return null;
+                    }
+                });
+                printBatch(printContent, 1);
+            }
+        });
+
+        /* 琛ㄦ牸鎿嶄綔鍒楃偣鍑讳簨浠� */
+        treeTable.on('tool(node)', function (obj) {
+            if (obj.event === 'edit') { // 淇敼
+                showEditModel(obj.data);
+            } else if (obj.event === 'del') { // 鍒犻櫎
+                doDel(obj);
+            }
+        });
+
+        /* 鏄剧ず琛ㄥ崟寮圭獥 */
+        function showEditModel(mData) {
+            admin.open({
+                type: 1,
+                area: '600px',
+                title: (mData ? '淇敼' : '娣诲姞') + '璐т綅',
+                content: $('#editDialog').html(),
+                success: function (layero, dIndex) {
+                    // 鍥炴樉琛ㄥ崟鏁版嵁
+                    form.val('detail', mData);
+                    // 琛ㄥ崟鎻愪氦浜嬩欢
+                    form.on('submit(editSubmit)', function (data) {
+                        data.field.orgId = insXmSel.getValue('valueStr');
+                        var loadIndex = layer.load(2);
+                        $.ajax({
+                            url: baseUrl+"/department/"+(mData?'update':'add')+"/auth",
+                            headers: {'token': localStorage.getItem('token')},
+                            data: data.field,
+                            method: 'POST',
+                            success: function (res) {
+                                layer.close(loadIndex);
+                                if (res.code === 200){
+                                    layer.close(dIndex);
+                                    layer.msg(res.msg, {icon: 1});
+                                    insTb.refresh();
+                                } else if (res.code === 403){
+                                    top.location.href = baseUrl+"/";
+                                }else {
+                                    layer.msg(res.msg, {icon: 2});
+                                }
+                            }
+                        })
+                        return false;
+                    });
+                    // 娓叉煋涓嬫媺鏍�
+                    var insXmSel = xmSelect.render({
+                        el: '#nodeParentSel',
+                        height: '250px',
+                        data: insTb.options.data,
+                        initValue: mData ? [mData.parentId] : [],
+                        model: {label: {type: 'text'}},
+                        prop: {
+                            name: 'name',
+                            value: 'id'
+                        },
+                        radio: true,
+                        clickClose: true,
+                        tree: {
+                            show: true,
+                            indent: 15,
+                            strict: false,
+                            expandedKeys: true
+                        }
+                    });
+                    // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                    layui.form.render('select');
+                }
+            });
+        }
+
+        /* 鍒犻櫎 */
+        function doDel(obj) {
+            layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+                skin: 'layui-layer-admin',
+                shade: .1
+            }, function (i) {
+                layer.close(i);
+                var loadIndex = layer.load(2);
+                var ids;
+                if (obj.data) {
+                    ids = [];
+                    ids[0] = obj.data.id;
+                } else {
+                    ids = obj.ids;
+                }
+                $.ajax({
+                    url: baseUrl+"/department/delete/auth",
+                    headers: {'token': localStorage.getItem('token')},
+                    data: {ids: ids},
+                    method: 'POST',
+                    success: function (res) {
+                        layer.close(loadIndex);
+                        if (res.code === 200){
+                            layer.msg(res.msg, {icon: 1});
+                            insTb.refresh();
+                        } else if (res.code === 403){
+                            top.location.href = baseUrl+"/";
+                        } else {
+                            layer.msg(res.msg, {icon: 2});
+                        }
+                    }
+                })
+            });
+        }
+
+        // 鎵归噺鎵撳嵃
+        function printBatch(printMsgList, type) {
+            var data = [];
+            for (var i = 0; i<printMsgList.length; i ++) {
+                if (printMsgList[i] != null && printMsgList[i] !== '') {
+                    var barcodeUrl;
+                    if (type === 1) {
+                        barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
+                    } else {
+                        barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
+                    }
+                    data.push({
+                        item: printMsgList[i],
+                        barcodeUrl: barcodeUrl
+                    })
+                }
+            }
+            var tpl = $('#locPrintTpl').html();
+            var template = Handlebars.compile(tpl);
+            var html = template({data: data});
+            var box = $("#printBox");
+            box.html(html);
+            box.show();
+            box.print({mediaPrint:true});
+            box.hide();
+        }
+
+    });
+
+    // excel瀵煎叆妯℃澘涓嬭浇
+    function excelMouldDownload(){
+        layer.load(1, {shade: [0.1,'#fff']});
+        location.href = baseUrl + "/node/excel/import/mould";
+        layer.closeAll('loading');
+    }
+
+    // excel瀵煎叆
+    function importExcel() {
+        $("#importExcel").trigger("click");
+    }
+    function upload(obj){
+        if(!obj.files) {
+            return;
+        }
+        var file = obj.files[0];
+        admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+            layer.load(1, {shade: [0.1,'#fff']});
+            var url = baseUrl + "/node/excel/import/auth";
+            var form = new FormData();
+            form.append("file", file);
+            xhr = new XMLHttpRequest();
+            xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+            xhr.setRequestHeader('token', localStorage.getItem('token'));
+            xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+            xhr.onerror =  uploadFailed; //璇锋眰澶辫触
+            xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+                layer.closeAll('loading');
+                $("#importExcel").val("");
+            };
+            // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+            xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+                ot = new Date().getTime();   //璁剧疆涓婁紶寮�濮嬫椂闂�
+                oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+            };
+            xhr.send(form);
+        }, function(index){
+            $("#importExcel").val("");
+        });
+    }
+    function uploadComplete(evt) {
+        var res = JSON.parse(evt.target.responseText);
+        if(res.code === 200) {
+            layer.msg(res.msg, {icon: 1});
+            insTb.refresh();
+        } else {
+            layer.msg(res.msg, {icon: 2});
+        }
+    }
+    function uploadFailed(evt) {
+        var res = JSON.parse(evt.target.responseText);
+        layer.msg(res.msg, {icon: 2});
+    }
+
+    // excel瀵煎嚭
+    function exportExcel() {
+
+    }
+
+</script>
+</body>
+</html>
+
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..ef10b06 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8">
     <title></title>
@@ -22,63 +23,64 @@
         }
     </style>
 </head>
+
 <body>
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid" style="padding-bottom: 0;">
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-body" style="padding: 10px;">
-                    <form class="layui-form toolbar">
-                        <div class="layui-form-item">
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鐢ㄦ埛鍚�:</label>
-                                <div class="layui-input-inline">
-                                    <input name="username" class="layui-input" placeholder="杈撳叆鐢ㄦ埛鍚�"/>
+    <!-- 姝ｆ枃寮�濮� -->
+    <div class="layui-fluid" style="padding-bottom: 0;">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <div class="layui-card-body" style="padding: 10px;">
+                        <form class="layui-form toolbar">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢ㄦ埛鍚�:</label>
+                                    <div class="layui-input-inline">
+                                        <input name="username" class="layui-input" placeholder="杈撳叆鐢ㄦ埛鍚�" />
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鎵嬫満鍙�:</label>
+                                    <div class="layui-input-inline">
+                                        <input name="mobile" class="layui-input" placeholder="杈撳叆鎵嬫満鍙�" />
+                                    </div>
+                                </div>
+                                <div class="layui-inline">&emsp;
+                                    <button class="layui-btn icon-btn" lay-filter="userTbSearch" lay-submit>
+                                        <i class="layui-icon">&#xe615;</i>鎼滅储
+                                    </button>
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鎵嬫満鍙�:</label>
-                                <div class="layui-input-inline">
-                                    <input name="mobile" class="layui-input" placeholder="杈撳叆鎵嬫満鍙�"/>
-                                </div>
-                            </div>
-                            <div class="layui-inline">&emsp;
-                                <button class="layui-btn icon-btn" lay-filter="userTbSearch" lay-submit>
-                                    <i class="layui-icon">&#xe615;</i>鎼滅储
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                    <table id="userTable" lay-filter="userTable"></table>
+                        </form>
+                        <table id="userTable" lay-filter="userTable"></table>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 
-<script type="text/html" id="hostTpl">
+    <script type="text/html" id="hostTpl">
     <span name="hostName" class="layui-badge layui-badge-gray">{{d.hostName}}</span>
 </script>
 
-<script type="text/html" id="statusTpl">
+    <script type="text/html" id="statusTpl">
     <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝ｅ父|绂佺敤" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}>
 </script>
 
-<script type="text/html" id="operate">
+    <script type="text/html" id="operate">
     <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
     <a class="layui-btn layui-btn-xs btn-edit layui-btn-warm" lay-event="resetPwd">閲嶇疆瀵嗙爜</a>
 </script>
 
-<script type="text/html" id="userToolbar">
+    <script type="text/html" id="userToolbar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon">&#xe654;</i>鏂板</button>
         <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon">&#xe640;</i>鍒犻櫎</button>
     </div>
 </script>
 
-<!-- 閲嶇疆瀵嗙爜 -->
-<script type="text/html" id="resetpwd-window">
+    <!-- 閲嶇疆瀵嗙爜 -->
+    <script type="text/html" id="resetpwd-window">
     <form class="layui-form model-form">
         <input type="hidden" id="resetUserId" name="resetUserId">
         <div class="layui-form-item">
@@ -94,8 +96,8 @@
     </form>
 </script>
 
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
+    <!-- 琛ㄥ崟寮圭獥 -->
+    <script type="text/html" id="editDialog">
     <form id="detail" lay-filter="detail" class="layui-form admin-form">
         <input name="id" type="hidden">
         <input name="status" type="hidden">
@@ -136,6 +138,18 @@
                         <input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">閮ㄩ棬锛�</label>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input name="deptId" class="layui-input" style="display: none">
+                        <input id="deptName" name="deptName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨閮ㄩ棬" onfocus=this.blur()>
+                        <div class="cool-auto-complete-window">
+                            <input class="cool-auto-complete-window-input" data-key="deptQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="deptQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+                </div>
 
             </div>
         </div>
@@ -147,16 +161,16 @@
     </form>
 </script>
 
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
-<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+    <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/tools/md5.js"></script>
+    <script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
 
-<!-- 椤圭洰缂栬緫绐楀彛 -->
-<script type="text/html" id="hostEditDialog">
+    <!-- 椤圭洰缂栬緫绐楀彛 -->
+    <script type="text/html" id="hostEditDialog">
     <form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form">
         <input name="id" type="hidden"/>
         <div class="layui-form-item">
@@ -173,5 +187,5 @@
     </form>
 </script>
 </body>
-</html>
 
+</html>
\ No newline at end of file

--
Gitblit v1.9.1