企业微信登录验证

# Conflicts:
#	config/database.php

.idea/php.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/topthink/think-installer" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-sae" />
+      <path value="$PROJECT_DIR$/vendor/pclzip/pclzip" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-worker" />
+      <path value="$PROJECT_DIR$/vendor/phpexcel/PHPExcel" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-image" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-mongo" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/zendframework/zend-escaper" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpword" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/common" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpexcel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/vendor/workerman/workerman" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-testing" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-helper" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-queue" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-migration" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>

.user.ini

@@ -1 +0,0 @@
-open_basedir=/www/wwwroot/72crm/:/tmp/

application/admin/model/User.php

@@ -651,7 +651,7 @@ class User extends Common
 
         $wxuser_id = Session::get('wxuser_id');
         if ($wxuser_id) {
-            $data['authKey'] = 'wxwork';
+            $data['authKey'] = $authKey;
             $userData['wxwork_id'] = $wxuser_id;
         } else {
             $userData['authkey'] = $authKey;

application/crm/controller/Callback.php

@@ -131,6 +131,7 @@ class Callback extends Controller
         if (isset($userInfo['userid']) && $userInfo['userid']) {
             Session::set('wxuser_id', $userInfo['userid']);
             $adminUser = db('admin_user')->where('wxwork_id', $userInfo['userid'])->find();
+            if($adminUser['status']==1){
                 if ($adminUser) {
                     Session::set('user_id', $adminUser['id']);
 
@@ -157,6 +158,7 @@ class Callback extends Controller
                     return redirect('http://web.lbschem.com:8088/?authkey=wxwork&sessionid='.session_id());
                 }
             }
+        }
         return redirect('http://web.lbschem.com:8088/');
     }
 }

application/crm/controller/Customer.php

@@ -31,7 +31,7 @@ class Customer extends ApiCommon
     {
         $action = [
             'permission' => ['exceldownload', 'setfollow', 'delete'],
-            'allow' => ['read', 'system', 'count', 'poolauthority', 'level']
+            'allow' => ['read', 'system', 'count', 'poolauthority', 'level','type']
         ];
         Hook::listen('check_auth', $action);
         $request = Request::instance();
@@ -1195,7 +1195,7 @@ class Customer extends ApiCommon
      * @since 2021-03-29
      * @author fanqi
      */
-    public function Type()
+    public function type()
     {
         $data = db('admin_field')->where(['types' => 'crm_customer', 'field' => 'crm_lthugd'])->value('options');
 

application/crm/controller/Message.php

@@ -103,9 +103,9 @@ class Message extends ApiCommon
             $data['todayCustomer'] = (int)$todayCustomerCount;
         } else {
             $todayCustomer = $this->todayCustomer(true);
-            $data['todayCustomer'] = $todayCustomer['dataCount'] ?: 0;
+            $data['todayCustomer'] = $todayCustomer['dataCount'] ? : 0;
-            cache('todayCustomerCount' . $userInfo['id'], $data['todayCustomer']);
+            cache('todayCustomerCount'.$userInfo['id'], $data['todayCustomer']);
-            cache('todayCustomerTime' . $userInfo['id'], time());
+            cache('todayCustomerTime'.$userInfo['id'], time() );
         }
         # 今日需联系商机
         $todayBusinessTime = cache('todayBusinessTime' . $userInfo['id']);

application/crm/model/Business.php

@@ -777,7 +777,7 @@ class Business extends Common
             "status_id",
             'COUNT(*)' => 'count',
             'SUM(`money`)' => 'sum',
-            'type_id'
+//            'type_id'
         ])
             ->where($where)
             ->whereNotIn('is_end', '3')

application/crm/model/Customer.php

@@ -155,15 +155,16 @@ class Customer extends Common
                     });
             };
         }
-        // 过滤角色
 
+        // 过滤角色
         $groupIds = db('admin_access')->where("user_id", array("eq", $user_id))->column("group_id");
         if (!in_array(1,$groupIds)){
             $groupNameArray = db('admin_group')->where("pid", array("eq", 2))->where("id", array("in", $groupIds))->column("title");
-            if ($groupNameArray)
+            if ($groupNameArray){
-
                 $map['customer.crm_lthugd'] = array('in', $groupNameArray);
             }
+        }
+
         # 代办事项 - 待进入公海
         $remindWhere = [];
         if ($is_remind) {
@@ -300,8 +301,8 @@ class Customer extends Common
             }
         }
         $data = [];
-        $data['list'] = $list ?: [];
         $data['dataCount'] = $dataCount ?: 0;
+        $data['list'] = $list ?: [];
         return $data;
     }
 

config/database.php

@@ -7,9 +7,9 @@ return [
     // 数据库名
     'database'        => 'wkcrm',
     // 用户名
-    'username'        => 'wkcrm',
+    'username'        => 'root',
     // 密码
-    'password'        => 'YNKdaMS2XBHKcAh7',
+    'password'        => '123123',
     // 端口
     'hostport'        => '3306',
     // 连接dsn