From 08fc78d0cca88885753aa6cf8662b03f2b71f387 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 9 Aug 2019 16:15:20 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin_v5.sql                                  | 113 +++++++++++++--
 application/company/command/Subversion.php    | 103 ++++++++++++++
 application/company/controller/Auth.php       | 101 ++++++++++++++
 application/company/controller/Clock.php      |  49 +++++++
 application/company/controller/User.php       | 131 ++++++++++++++++++
 application/company/controller/api/Push.php   |  97 +++++++++++++
 application/company/service/DataService.php   |  40 ++++++
 application/company/sys.php                   |  21 +++
 application/company/view/auth/form.html       |  35 +++++
 application/company/view/auth/index.html      |  78 +++++++++++
 .../company/view/auth/index_search.html       |  50 +++++++
 application/company/view/clock/index.html     |  41 ++++++
 .../company/view/clock/index_search.html      |  28 ++++
 application/company/view/user/form.html       |  89 ++++++++++++
 application/company/view/user/index.html      |  83 +++++++++++
 .../company/view/user/index_search.html       |  50 +++++++
 public/static/admin.js                        |   9 ++
 17 files changed, 1105 insertions(+), 13 deletions(-)
 create mode 100644 application/company/command/Subversion.php
 create mode 100644 application/company/controller/Auth.php
 create mode 100644 application/company/controller/Clock.php
 create mode 100644 application/company/controller/User.php
 create mode 100644 application/company/controller/api/Push.php
 create mode 100644 application/company/service/DataService.php
 create mode 100644 application/company/sys.php
 create mode 100644 application/company/view/auth/form.html
 create mode 100644 application/company/view/auth/index.html
 create mode 100644 application/company/view/auth/index_search.html
 create mode 100644 application/company/view/clock/index.html
 create mode 100644 application/company/view/clock/index_search.html
 create mode 100644 application/company/view/user/form.html
 create mode 100644 application/company/view/user/index.html
 create mode 100644 application/company/view/user/index_search.html

diff --git a/admin_v5.sql b/admin_v5.sql
index 3b858c32d..f88dec5c2 100644
--- a/admin_v5.sql
+++ b/admin_v5.sql
@@ -1,22 +1,90 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : local.ctolog.com
+ Source Server         : local.server.cuci.cc
  Source Server Type    : MySQL
  Source Server Version : 50562
- Source Host           : 127.0.0.1:3306
- Source Schema         : admin_v4_1
+ Source Host           : server.cuci.cc:3306
+ Source Schema         : admin_v5
 
  Target Server Type    : MySQL
  Target Server Version : 50562
  File Encoding         : 65001
 
- Date: 06/07/2019 19:07:04
+ Date: 09/08/2019 16:14:13
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
+-- ----------------------------
+-- Table structure for company_user
+-- ----------------------------
+DROP TABLE IF EXISTS `company_user`;
+CREATE TABLE `company_user`  (
+  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '员工姓名',
+  `svn_username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '员工账号',
+  `svn_password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '员工密码',
+  `svn_authorize` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限授权',
+  `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '员工身份',
+  `entry_date` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '入职日期',
+  `leave_date` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '离职日期',
+  `become_date` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '转正日期',
+  `contact_qq` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系QQ',
+  `contact_mail` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系邮箱',
+  `contact_phone` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系手机',
+  `mobile_macs` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '打卡手机',
+  `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '状态(0禁用,1正常,2离职)',
+  `sort` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '排序权重',
+  `is_deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除(1删除,0未删)',
+  `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `index_company_user_nickname`(`nickname`) USING BTREE,
+  INDEX `index_company_user_svn_username`(`svn_username`) USING BTREE,
+  INDEX `index_company_user_deleted`(`is_deleted`) USING BTREE,
+  INDEX `index_company_user_status`(`status`) USING BTREE,
+  INDEX `index_company_user_type`(`user_type`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业-员工信息';
+
+-- ----------------------------
+-- Table structure for company_user_auth
+-- ----------------------------
+DROP TABLE IF EXISTS `company_user_auth`;
+CREATE TABLE `company_user_auth`  (
+  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限名称',
+  `path` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限路径',
+  `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '状态(0禁用,1正常)',
+  `desc` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限描述',
+  `sort` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '排序权重',
+  `is_deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除(1删除,0未删)',
+  `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `index_company_user_auth_status`(`status`) USING BTREE,
+  INDEX `index_company_user_auth_deleted`(`is_deleted`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业-仓库权限';
+
+-- ----------------------------
+-- Table structure for company_user_clock
+-- ----------------------------
+DROP TABLE IF EXISTS `company_user_clock`;
+CREATE TABLE `company_user_clock`  (
+  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `uid` bigint(20) UNSIGNED NULL DEFAULT NULL COMMENT '用户ID',
+  `name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户姓名',
+  `ip` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '权限名称',
+  `mac` char(17) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '1' COMMENT '状态(1:禁用,2:启用)',
+  `desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注说明',
+  `date` date NULL DEFAULT NULL,
+  `start_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `end_at` datetime NULL DEFAULT NULL COMMENT '结束时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `index_company_user_clock_date`(`date`) USING BTREE,
+  INDEX `index_company_user_clock_uid`(`uid`) USING BTREE,
+  INDEX `index_company_user_clock_name`(`name`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '企业-打卡记录';
+
 -- ----------------------------
 -- Table structure for store_express_company
 -- ----------------------------
@@ -403,14 +471,14 @@ CREATE TABLE `system_config`  (
   `value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配置值',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `index_system_config_name`(`name`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 74 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置';
+) ENGINE = InnoDB AUTO_INCREMENT = 81 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置';
 
 -- ----------------------------
 -- Records of system_config
 -- ----------------------------
 INSERT INTO `system_config` VALUES (1, 'app_name', 'ThinkAdmin');
 INSERT INTO `system_config` VALUES (2, 'site_name', 'ThinkAdmin');
-INSERT INTO `system_config` VALUES (3, 'app_version', 'v5');
+INSERT INTO `system_config` VALUES (3, 'app_version', 'dev');
 INSERT INTO `system_config` VALUES (4, 'site_copy', '©版权所有 2014-2018 楚才科技');
 INSERT INTO `system_config` VALUES (5, 'site_icon', '/upload/decb0fe26fa3f486/b3f6521bf29403c8.png');
 INSERT INTO `system_config` VALUES (7, 'miitbeian', '粤ICP备16006642号-2');
@@ -441,10 +509,10 @@ INSERT INTO `system_config` VALUES (54, 'wechat_encodingaeskey', '');
 INSERT INTO `system_config` VALUES (55, 'wechat_push_url', '消息推送地址：http://127.0.0.1:8000/wechat/api.push');
 INSERT INTO `system_config` VALUES (56, 'wechat_type', 'thr');
 INSERT INTO `system_config` VALUES (57, 'wechat_thr_appid', 'wx60a43dd8161666d4');
-INSERT INTO `system_config` VALUES (58, 'wechat_thr_appkey', 'd2c0139213d7a27898ca047d81a617be');
+INSERT INTO `system_config` VALUES (58, 'wechat_thr_appkey', '5caf4b0727f6e46a7e6ccbe773cc955d');
 INSERT INTO `system_config` VALUES (60, 'wechat_thr_appurl', '消息推送地址：http://127.0.0.1:8000/wechat/api.push');
 INSERT INTO `system_config` VALUES (61, 'component_appid', 'wx28b58798480874f9');
-INSERT INTO `system_config` VALUES (62, 'component_appsecret', '87ddce1cc24e4cd691039f926febd942');
+INSERT INTO `system_config` VALUES (62, 'component_appsecret', '8d0e1ec14ea0adc5027dd0ad82c64bc9');
 INSERT INTO `system_config` VALUES (63, 'component_token', 'P8QHTIxpBEq88IrxatqhgpBm2OAQROkI');
 INSERT INTO `system_config` VALUES (64, 'component_encodingaeskey', 'L5uFIa0U6KLalPyXckyqoVIJYLhsfrg8k9YzybZIHsx');
 INSERT INTO `system_config` VALUES (65, 'system_message_state', '0');
@@ -456,6 +524,13 @@ INSERT INTO `system_config` VALUES (70, 'store_title', '测试商城');
 INSERT INTO `system_config` VALUES (71, 'store_order_wait_time', '0.50');
 INSERT INTO `system_config` VALUES (72, 'store_order_clear_time', '24.00');
 INSERT INTO `system_config` VALUES (73, 'store_order_confirm_time', '60.00');
+INSERT INTO `system_config` VALUES (74, 'sms_zt_username2', '可以找CUCI申请2');
+INSERT INTO `system_config` VALUES (75, 'sms_zt_password2', '可以找CUCI申请2');
+INSERT INTO `system_config` VALUES (76, 'sms_secure2', '可以找CUCI申请2');
+INSERT INTO `system_config` VALUES (77, 'sms_reg_template2', '您的验证码为{code}，请在十分钟内完成操作！2');
+INSERT INTO `system_config` VALUES (78, 'michat_appid', '2882303761518074614');
+INSERT INTO `system_config` VALUES (79, 'michat_appkey', '5861807470614');
+INSERT INTO `system_config` VALUES (80, 'michat_appsecert', 'CP/WUTUgDuyOxgLQ5ztesg==');
 
 -- ----------------------------
 -- Table structure for system_data
@@ -467,7 +542,12 @@ CREATE TABLE `system_data`  (
   `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置值',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `index_system_data_name`(`name`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-数据';
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-数据';
+
+-- ----------------------------
+-- Records of system_data
+-- ----------------------------
+INSERT INTO `system_data` VALUES (1, 'menudata', '[{\"name\":\"请输入名称\",\"type\":\"scancode_push\",\"key\":\"scancode_push\"}]');
 
 -- ----------------------------
 -- Table structure for system_jobs
@@ -545,7 +625,7 @@ CREATE TABLE `system_menu`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `index_system_menu_node`(`node`(191)) USING BTREE,
   INDEX `index_system_menu_status`(`status`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-菜单';
+) ENGINE = InnoDB AUTO_INCREMENT = 62 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-菜单';
 
 -- ----------------------------
 -- Records of system_menu
@@ -587,6 +667,12 @@ INSERT INTO `system_menu` VALUES (49, 4, '系统日志管理', '', 'layui-icon l
 INSERT INTO `system_menu` VALUES (50, 47, '快递公司管理', '', 'layui-icon layui-icon-form', 'store/express_company/index', '', '_self', 3, 1, '2019-04-01 17:10:59');
 INSERT INTO `system_menu` VALUES (52, 47, '邮费模板管理', '', 'layui-icon layui-icon-fonts-clear', 'store/express_template/index', '', '_self', 1, 1, '2019-04-23 13:17:10');
 INSERT INTO `system_menu` VALUES (55, 17, '微信数据统计', '', 'layui-icon layui-icon-chart-screen', 'wechat/index/index', '', '_self', 3, 1, '2019-06-15 15:03:51');
+INSERT INTO `system_menu` VALUES (56, 40, '微信粉丝管理', '', 'layui-icon layui-icon-username', 'service/fans/index', '', '_self', 0, 1, '2019-07-23 09:57:24');
+INSERT INTO `system_menu` VALUES (57, 0, '企业管理', '', '', '#', '', '_self', 150, 1, '2019-08-08 17:20:29');
+INSERT INTO `system_menu` VALUES (58, 57, '基础管理', '', '', '#', '', '_self', 0, 1, '2019-08-08 17:20:42');
+INSERT INTO `system_menu` VALUES (59, 58, '企业员工管理', '', 'layui-icon layui-icon-username', 'company/user/index', '', '_self', 0, 1, '2019-08-08 17:20:59');
+INSERT INTO `system_menu` VALUES (60, 58, '仓库权限管理', '', 'layui-icon layui-icon-template-1', 'company/auth/index', '', '_self', 0, 1, '2019-08-08 18:39:37');
+INSERT INTO `system_menu` VALUES (61, 58, '网络打卡管理', '', 'layui-icon layui-icon-engine', 'company/clock/index', '', '_self', 0, 1, '2019-08-09 14:44:23');
 
 -- ----------------------------
 -- Table structure for system_user
@@ -603,9 +689,10 @@ CREATE TABLE `system_user`  (
   `login_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登录IP',
   `login_num` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '登录次数',
   `authorize` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限授权',
+  `tags` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户标签',
   `desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注说明',
-  `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '状态(0:禁用,1:启用)',
-  `is_deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除(1:删除,0:未删)',
+  `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '状态(0禁用,1启用)',
+  `is_deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除(1删除,0未删)',
   `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `index_system_user_username`(`username`) USING BTREE,
@@ -616,7 +703,7 @@ CREATE TABLE `system_user`  (
 -- ----------------------------
 -- Records of system_user
 -- ----------------------------
-INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '22222222', '', '', '2019-07-06 18:29:31', '127.0.0.1', 611, '', '', 1, 0, '2015-11-13 15:14:22');
+INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '22222222', '', '', '2019-08-09 15:19:41', '10.1.1.10', 655, '', '', '', 1, 0, '2015-11-13 15:14:22');
 
 -- ----------------------------
 -- Table structure for wechat_fans
diff --git a/application/company/command/Subversion.php b/application/company/command/Subversion.php
new file mode 100644
index 000000000..0935862a1
--- /dev/null
+++ b/application/company/command/Subversion.php
@@ -0,0 +1,103 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Db;
+
+/**
+ * SVN 版本指令
+ * Class Subversion
+ * @package app\company\command
+ */
+class Subversion extends Command
+{
+    /**
+     * 账号授权文件位置
+     * @var string
+     */
+    protected $authzFile = 'php://output';
+
+    /**
+     * 账号管理文件位置
+     * @var string
+     */
+    protected $passwdFile = 'php://output';
+
+    /**
+     * 配置指令配置
+     */
+    protected function configure()
+    {
+        $this->setName('xsubversion:config')->setDescription('从数据库的配置同步到SVN配置文件');
+    }
+
+    /**
+     * @param Input $input
+     * @param Output $output
+     * @return int|void|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $paths = ['/' => [0]];
+        $where = ['status' => '1', 'is_deleted' => '0'];
+        // 取得可用的用户账号
+        $users = Db::name('CompanyUser')->field('svn_username,svn_password,svn_authorize')->where($where)->select();
+        $authids = array_unique(explode(',', join(',', array_column($users, 'svn_authorize'))));
+        // 取得可用的权限配置
+        $userAuths = Db::name('CompanyUserAuth')->field('id,path')->where($where)->whereIn('id', $authids)->order('sort desc,id desc')->select();
+        foreach ($userAuths as $item) foreach (explode("\n", preg_replace('/\s+/i', "\n", trim($item['path']))) as $path) {
+            $paths[$path][] = $item['id'];
+        }
+        $this->writeAuth($users, $paths);
+    }
+
+    /**
+     * 写入 SVN 配置文件
+     * @param array $users
+     * @param array $paths
+     */
+    protected function writeAuth($users, $paths)
+    {
+        $output = [];
+        // Passwd 用户账号处理
+        foreach ($users as $user) $output[] = "{$user['svn_username']}={$user['svn_password']}";
+        file_put_contents($this->passwdFile, join(PHP_EOL, $output));
+        // Authz 授权配置处理
+        $groups = ['_0' => []];
+        foreach ($users as $user) {
+            $ids = array_unique(explode(',', $user['svn_authorize']));
+            foreach ($ids as $id) $groups["_{$id}"][] = $user['svn_username'];
+        }
+        $output = [];
+        $output[] = '[groups]';
+        foreach ($groups as $key => $group) $output[] = "group{$key}=" . join(',', $group);
+        $output[] = '';
+        foreach ($paths as $path => $ids) {
+            $output[] = "[{$path}]";
+            $output[] = "* =";
+            $output[] = '@group_0 = rw';
+            foreach ($ids as $id) if ($id > 0) $output[] = "@group_{$id} = rw";
+            $output[] = '';
+        }
+        file_put_contents($this->authzFile, join(PHP_EOL, $output));
+    }
+}
diff --git a/application/company/controller/Auth.php b/application/company/controller/Auth.php
new file mode 100644
index 000000000..046411954
--- /dev/null
+++ b/application/company/controller/Auth.php
@@ -0,0 +1,101 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\controller;
+
+use library\Controller;
+
+/**
+ * 仓库权限管理
+ * Class Auth
+ * @package app\company\controller
+ */
+class Auth extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'CompanyUserAuth';
+
+    /**
+     * 仓库权限管理
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '仓库权限管理';
+        $query = $this->_query($this->table)->like('title,path')->equal('status');
+        $query->dateBetween('create_at')->where(['is_deleted' => '0'])->page();
+    }
+
+    /**
+     * 添加SVN权限
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->title = '添加SVN权限';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑SVN权限
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 修改SVN权限状态
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function state()
+    {
+        $this->_save($this->table, ['status' => input('status')]);
+    }
+
+    /**
+     * 删除SVN权限
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
+}
diff --git a/application/company/controller/Clock.php b/application/company/controller/Clock.php
new file mode 100644
index 000000000..1a544bce3
--- /dev/null
+++ b/application/company/controller/Clock.php
@@ -0,0 +1,49 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\controller;
+
+use library\Controller;
+
+/**
+ * 网络打卡管理
+ * Class Clock
+ * @package app\company\controller
+ */
+class Clock extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'CompanyUserClock';
+
+    /**
+     * 网络打卡管理
+     * @auth true
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '网络打卡管理';
+        $this->_query($this->table)->like('name')->equal('date')->order('id asc')->page();
+    }
+
+}
diff --git a/application/company/controller/User.php b/application/company/controller/User.php
new file mode 100644
index 000000000..b365cdab6
--- /dev/null
+++ b/application/company/controller/User.php
@@ -0,0 +1,131 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\controller;
+
+use app\company\service\DataService;
+use library\Controller;
+use think\Db;
+
+/**
+ * 企业员工管理
+ * Class User
+ * @package app\worker\controller
+ */
+class User extends Controller
+{
+
+    /**
+     * 绑定当前数据表
+     * @var string
+     */
+    protected $table = 'CompanyUser';
+
+    /**
+     * 企业员工管理
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '仓库权限管理';
+        $this->_query($this->table)->like('nickname,svn_username')->equal('status')->page();
+    }
+
+    /**
+     * 添加企业员工
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->_form($this->table, 'form');
+    }
+
+
+    /**
+     * 修改企业员工
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 权限表单数据处理
+     * @param array $data 表单数据
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet()) {
+            $where = ['status' => '1', 'is_deleted' => '0'];
+            $this->auths = Db::name('company_user_auth')->where($where)->order('sort desc,id desc')->select();
+            array_unshift($this->auths, ['id' => '0', 'title' => '所有权限', 'path' => '/']);
+            $data['svn_authorize'] = isset($data['svn_authorize']) ? explode(',', $data['svn_authorize']) : [];
+        } else {
+            if (isset($data['svn_authorize']) && is_array($data['svn_authorize'])) {
+                $data['svn_authorize'] = join(',', $data['svn_authorize']);
+            } else {
+                $data['svn_authorize'] = '';
+            }
+            $macs = [];
+            foreach (explode(PHP_EOL, preg_replace("/\s+/", PHP_EOL, trim($data['mobile_macs']))) as $mac) {
+                if (DataService::applyMacValue($mac)) $macs[] = $mac;
+            }
+            $data['mobile_macs'] = join(PHP_EOL, array_unique($macs));
+        }
+    }
+
+    /**
+     * 更改企业员工状态
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function state()
+    {
+        $this->_save($this->table, ['status' => input('status', '0')]);
+    }
+
+    /**
+     * 删除企业员工
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
+}
diff --git a/application/company/controller/api/Push.php b/application/company/controller/api/Push.php
new file mode 100644
index 000000000..83f69dcc2
--- /dev/null
+++ b/application/company/controller/api/Push.php
@@ -0,0 +1,97 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\controller\api;
+
+use app\company\service\DataService;
+use library\Controller;
+use think\Db;
+
+/**
+ * ARP-SAN 推送内容接收
+ * Class Push
+ * @package app\company\controller\api
+ */
+class Push extends Controller
+{
+    /**
+     * ARP-SAN 推送内容接收
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        // 数据输入检查
+        $content = file_get_contents('php://input');
+        if (empty($content)) $this->error('没有接收到数据');
+        // 企业员工检查
+        $where = ['is_deleted' => '0', 'status' => '1'];
+        $users = Db::name('CompanyUser')->cache(10)->where($where)->column('id uid,nickname name,mobile_macs mac');
+        if (empty($users)) $this->error('没有需要打卡的用户');
+        // 企业员工检查
+        $macs = [];
+        foreach ($users as $user) foreach (explode("\n", preg_replace('/\s+/', "\n", $user['mac'])) as $mac) {
+            if (DataService::applyMacValue($mac)) $macs[$mac] = ['uid' => $user['uid'], 'name' => $user['name']];
+        }
+        // 数据内容解析
+        list($s, $e) = [0, 0];
+        foreach (explode("\n", $content) as $line) {
+            list($ip, $mac, $dsc) = explode(' ', preg_replace('/\s+/', ' ', trim($line)) . '  ');
+            if (preg_match('/^(\d+\.?){4}$/', $ip) && DataService::applyMacValue($mac)) {
+                if (isset($macs[$mac])) {
+                    $s++;
+                    $this->writeUser($ip, $mac, strtoupper($dsc), $macs);
+                } else {
+                    $e++;
+                    $this->writeNone($ip, $mac, strtoupper($dsc));
+                }
+            }
+        }
+        return "接收到{$s}个已知设备推送，{$e}个未知设备推送。" . PHP_EOL . PHP_EOL;
+    }
+
+    /**
+     * 已知设备打卡记录
+     * @param string $ip 内网地址
+     * @param string $mac 设备地址
+     * @param string $desc 设备描述
+     * @param array $macs 用户MAC列表
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    private function writeUser($ip, $mac, $desc, $macs)
+    {
+        if (isset($macs[$mac])) {
+            $data = $macs[$mac];
+            $data['ip'] = $ip;
+            $data['mac'] = $mac;
+            $data['desc'] = $desc;
+            $data['date'] = date('Y-m-d');
+            $data['end_at'] = date('Y-m-d H:i:s');
+            data_save('CompanyUserClock', $data, 'uid', ['date' => $data['date']]);
+        }
+    }
+
+    /**
+     * 未知设备额外标识
+     * @param string $ip 内网地址
+     * @param string $mac 设备地址
+     * @param string $desc 设备描述
+     */
+    private function writeNone($ip, $mac, $desc)
+    {
+
+    }
+}
diff --git a/application/company/service/DataService.php b/application/company/service/DataService.php
new file mode 100644
index 000000000..33b8ce61f
--- /dev/null
+++ b/application/company/service/DataService.php
@@ -0,0 +1,40 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\company\service;
+
+/**
+ * 企业数据处理服务
+ * Class DataService
+ * @package app\company\service
+ */
+class DataService
+{
+    /**
+     * 格式化MAC地址信息
+     * @param string $mac
+     * @return string
+     */
+    public static function applyMacValue(&$mac)
+    {
+        $mac = strtoupper(str_replace('-', ':', $mac));
+        if (preg_match('/([A-F0-9]{2}:){5}[A-F0-9]{2}/', $mac)) {
+            return $mac;
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/application/company/sys.php b/application/company/sys.php
new file mode 100644
index 000000000..4e230e52f
--- /dev/null
+++ b/application/company/sys.php
@@ -0,0 +1,21 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+// 注册系统指令
+use think\Console;
+
+Console::addDefaultCommands([
+    'app\company\command\Subversion',
+]);
diff --git a/application/company/view/auth/form.html b/application/company/view/auth/form.html
new file mode 100644
index 000000000..7a2f59d41
--- /dev/null
+++ b/application/company/view/auth/form.html
@@ -0,0 +1,35 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-card-body">
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">权限名称</label>
+            <div class="layui-input-block">
+                <input name="title" value='{$vo.title|default=""}' required placeholder="请输入权限名称" class="layui-input">
+                <p class="help-block">权限名称将出现在员工SVN授权处，请根据需求准确填写权限名称。</p>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">权限路径</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" name="path" placeholder="请输入权限路径">{$vo.path|default=''}</textarea>
+                <p class="help-block">权限路径将配置到SVN权限分组上，务必要保证路径与SVN文件路径一致。</p>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">权限描述</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" name="desc" placeholder="请输入权限描述">{$vo.desc|default=''}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+    <div class="layui-form-item text-center">
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+
+    <script>window.form.render();</script>
+
+</form>
diff --git a/application/company/view/auth/index.html b/application/company/view/auth/index.html
new file mode 100644
index 000000000..640d02e97
--- /dev/null
+++ b/application/company/view/auth/index.html
@@ -0,0 +1,78 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button data-modal='{:url("add")}' data-title="添加仓库权限" class='layui-btn layui-btn-sm layui-btn-primary'>添加仓库权限</button>
+{/if}
+
+{if auth("remove")}
+<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些权限吗？" class='layui-btn layui-btn-sm layui-btn-primary'>添加仓库权限</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='auth/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </th>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
+            <th class='text-left nowrap'>权限名称</th>
+            <th class='text-left nowrap'>权限路径</th>
+            <th class='text-center nowrap'>使用状态</th>
+            <th class='text-left nowrap'>登录时间</th>
+            <th class='text-left nowrap'></th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
+            </td>
+            <td class='list-table-sort-td'>
+                <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
+            </td>
+            <td class='text-left nowrap'>{$vo.title|default=''}</td>
+            <td class='text-left nowrap'>{$vo.path|nl2br|raw}</td>
+            <td class='text-center nowrap'>
+                {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{/eq}
+                {eq name='vo.status' value='1'}<span class="color-green">使用中</span>{/eq}
+            </td>
+            <td class='text-left nowrap'>{$vo.create_at|format_datetime}</td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑仓库权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                {/if}
+
+                {if auth("state") and $vo.status neq 0}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                {elseif auth("state") and $vo.status neq 1 }
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
+                {/if}
+
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该权限吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}
diff --git a/application/company/view/auth/index_search.html b/application/company/view/auth/index_search.html
new file mode 100644
index 000000000..18009dd32
--- /dev/null
+++ b/application/company/view/auth/index_search.html
@@ -0,0 +1,50 @@
+<fieldset>
+
+    <legend>条件搜索</legend>
+
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">权限名称</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入权限名称" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">权限路径</label>
+            <div class="layui-input-inline">
+                <input name="path" value="{$Think.get.path|default=''}" placeholder="请输入权限路径" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">使用状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach [''=>'-- 全部状态 --','0'=>'已禁用的权限','1'=>'使用中的权限'] as $k=>$v}
+                    {eq name='Think.get.status' value='$k.""'}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/eq}
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">创建时间</label>
+            <div class="layui-input-inline">
+                <input data-date-range name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>form.render()</script>
diff --git a/application/company/view/clock/index.html b/application/company/view/clock/index.html
new file mode 100644
index 000000000..f97ff568c
--- /dev/null
+++ b/application/company/view/clock/index.html
@@ -0,0 +1,41 @@
+{extend name='admin@main'}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='clock/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </th>
+            <th class='text-left nowrap'>员工姓名</th>
+            <th class='text-left nowrap'>打卡日期</th>
+            <th class='text-left nowrap'>内网地址</th>
+            <th class='text-left nowrap'>首次打卡</th>
+            <th class='text-left nowrap'>最后打卡</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
+            </td>
+            <td class='text-left nowrap'>{$vo.name|default=''}</td>
+            <td class='text-left nowrap'>{$vo.date|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.ip|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.start_at|format_datetime}</td>
+            <td class='text-left nowrap'>{$vo.end_at|format_datetime}</td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}
diff --git a/application/company/view/clock/index_search.html b/application/company/view/clock/index_search.html
new file mode 100644
index 000000000..d56ad8e32
--- /dev/null
+++ b/application/company/view/clock/index_search.html
@@ -0,0 +1,28 @@
+<fieldset>
+
+    <legend>条件搜索</legend>
+
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">员工姓名</label>
+            <div class="layui-input-inline">
+                <input name="name" value="{$Think.get.name|default=''}" placeholder="请输入员工姓名" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">打卡日期</label>
+            <div class="layui-input-inline">
+                <input data-date-input="date" name="date" value="{$Think.get.date|default=''}" placeholder="请输入打卡日期" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>form.render()</script>
diff --git a/application/company/view/user/form.html b/application/company/view/user/form.html
new file mode 100644
index 000000000..add898ed0
--- /dev/null
+++ b/application/company/view/user/form.html
@@ -0,0 +1,89 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-card-body">
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">员工姓名</label>
+            <div class="layui-input-block">
+                <input name="nickname" value='{$vo.nickname|default=""}' required placeholder="请输入公司员工姓名" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">员工身份</label>
+            <div class="layui-input-block">
+                <input name="user_type" value='{$vo.user_type|default=""}' required placeholder="请输入公司员工身份" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库账号</label>
+            <div class="layui-input-block">
+                <input name="svn_username" value='{$vo.svn_username|default=""}' required placeholder="请输入SVN授权账号" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库密码</label>
+            <div class="layui-input-block">
+                <input name="svn_password" value='{$vo.svn_password|default=""}' required placeholder="请输入SVN授权密码" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库权限</label>
+            <div class="layui-input-block">
+                <div class="layui-textarea padding-bottom-10" style="min-height:auto">
+                    {foreach $auths as $auth}
+                    <label class="think-checkbox layui-unselect">
+                        {if isset($vo.svn_authorize) and in_array($auth.id, $vo.svn_authorize)}
+                        <input type="checkbox" name="svn_authorize[]" value="{$auth.id}" checked lay-ignore> {$auth.title}
+                        {else}
+                        <input type="checkbox" name="svn_authorize[]" value="{$auth.id}" lay-ignore> {$auth.title}
+                        {/if}
+                    </label>
+                    {/foreach}
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item nowrap">
+            <label class="layui-form-label">入职日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="entry_date" value='{$vo.entry_date|default=""}' placeholder="请输入入职日期" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">转正日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="become_date" value='{$vo.become_date|default=""}' placeholder="请输入转正日期" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">离职日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="leave_date" value='{$vo.leave_date|default=""}' placeholder="请输入离职日期" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">联系ＱＱ</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="tel" autocomplete="off" name="contact_qq" value='{$vo.contact_qq|default=""}' pattern="^\d{6,}$" placeholder="请输入联系ＱＱ号码" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">联系手机</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="tel" maxlength="11" autocomplete="off" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入联系手机" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">联系邮箱</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input name="contact_mail" autocomplete="off" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系邮箱" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">打卡绑定</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入绑定手机" class="layui-textarea" name="mobile_macs">{$vo.mobile_macs|default=""}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+    <div class="layui-form-item text-center">
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+
+    <script>window.form.render();</script>
+
+</form>
diff --git a/application/company/view/user/index.html b/application/company/view/user/index.html
new file mode 100644
index 000000000..573067049
--- /dev/null
+++ b/application/company/view/user/index.html
@@ -0,0 +1,83 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button data-modal='{:url("add")}' data-title="添加企业员工" class='layui-btn layui-btn-sm layui-btn-primary'>添加企业员工</button>
+{/if}
+
+{if auth("remove")}
+<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些员工吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除企业员工</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='user/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </th>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
+            <th class='text-left nowrap'>员工姓名</th>
+            <th class='text-left nowrap'>员工身份</th>
+            <th class='text-left nowrap'>库存账号</th>
+            <th class='text-center nowrap'>使用状态</th>
+            <th class='text-left nowrap'>添加时间</th>
+            <th class='text-left nowrap'></th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
+            </td>
+            <td class='list-table-sort-td'>
+                <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
+            </td>
+            <td class='text-left nowrap'>{$vo.nickname|default=''}</td>
+            <td class='text-left nowrap'>{$vo.user_type|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.svn_username|default='-'}</td>
+            <td class='text-center nowrap'>
+                {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{/eq}
+                {eq name='vo.status' value='1'}<span class="color-green">在职中</span>{/eq}
+                {eq name='vo.status' value='2'}<span class="color-desc">已离职</span>{/eq}
+            </td>
+            <td class='text-left nowrap'>
+                {$vo.create_at|format_datetime}
+            </td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑员工信息" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                {/if}
+
+                {if auth("state") and $vo.status neq 0}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                {elseif auth("state") and $vo.status neq 1 }
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
+                {/if}
+
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该员工吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}
diff --git a/application/company/view/user/index_search.html b/application/company/view/user/index_search.html
new file mode 100644
index 000000000..09915989a
--- /dev/null
+++ b/application/company/view/user/index_search.html
@@ -0,0 +1,50 @@
+<fieldset>
+
+    <legend>条件搜索</legend>
+
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">员工姓名</label>
+            <div class="layui-input-inline">
+                <input name="nickname" value="{$Think.get.nickname|default=''}" placeholder="请输入员工姓名" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">仓库账号</label>
+            <div class="layui-input-inline">
+                <input name="svn_username" value="{$Think.get.svn_username|default=''}" placeholder="请输入仓库账号" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">员工状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach [''=>'-- 全部状态 --','0'=>'禁用的员工','1'=>'正常的员工','2'=>'离职的员工'] as $k=>$v}
+                    {eq name='Think.get.status' value='$k.""'}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/eq}
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">添加时间</label>
+            <div class="layui-input-inline">
+                <input data-date-range name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择添加时间" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>form.render()</script>
diff --git a/public/static/admin.js b/public/static/admin.js
index f64a16748..bd16070ea 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -155,6 +155,15 @@ $(function () {
                     }
                 });
             });
+            $dom.find('input[data-date-input]').map(function () {
+                this.setAttribute('autocomplete', 'off');
+                laydate.render({
+                    type: this.getAttribute('data-date-input') || 'date',
+                    range: false, elem: this, done: function (value) {
+                        $(this.elem).val(value).trigger('change');
+                    }
+                });
+            });
             $dom.find('[data-file]:not([data-inited])').map(function (index, elem, $this, field) {
                 $this = $(elem), field = $this.attr('data-field') || 'file';
                 if (!$this.data('input')) $this.data('input', $('[name="' + field + '"]').get(0));