update

.gitattributes

@@ -2,4 +2,8 @@
 /webmain/model/loginModel.php merge=ours
 /webmain/webmainConfig.php merge=ours
 /.idea/ merge=ours
+<<<<<<< HEAD
 /images/OA二维码.png merge=ours
+=======
+/images/OA二维码.png merge=ours
+>>>>>>> 54d3127f87cdef7cc1f3ab124f081dbc0ee0c411

config/config.php

-<?php
-/**
-*	来自：信呼开发团队
-*	作者：磐石(rainrock)
-*	网址：http://www.rockoa.com/
-*	系统默认配置文件，请不要去修改
-*	要修改配置文件在：webmain/webmainConfig.php
-*/
-
-//调整session为redis
-ini_set('session.save_handler', 'redis');
-ini_set('session.save_path', 'tcp://192.168.1.71:6379');
-ini_set('session.cookie_path', '/');
-ini_set('session.cookie_domain', 'gonn.tech');
-ini_set('session.cookie_lifetime', '7200');
-
-@session_start();
-if(function_exists('date_default_timezone_set'))date_default_timezone_set('Asia/Shanghai'); //设置默认时区
-header('Content-Type:text/html;charset=utf-8');
-define('ROOT_PATH',str_replace('\\','/',dirname(dirname(__FILE__))));	//系统跟目录路径
-
-include_once(''.ROOT_PATH.'/include/rockFun.php');
-include_once(''.ROOT_PATH.'/include/Chajian.php');
-include_once(''.ROOT_PATH.'/include/class/rockClass.php');
-$rock 		= new rockClass();
-
-$db			= null;		
-$smarty		= false;
-define('HOST', $rock->host);
-define('REWRITE', 'true');
-if(!defined('PROJECT'))define('PROJECT', $rock->get('p', 'webmain'));
-if(!defined('ENTRANCE'))define('ENTRANCE', 'index');
-
-$config		= array(
-	'title'		=> '信呼',
-	'url'		=> '',
-	'urly'		=> 'http://www.rockoa.com/',	//官网域名地址，修改后就无法提供在线升级了。
-	'db_host'	=> '127.0.0.1',
-	'db_user'	=> 'root',
-	'db_pass'	=> '',
-	'db_base'	=> '',
-	'perfix'	=> '',
-	'qom'		=> '',
-	'highpass'	=> '',
-	'install'	=> false,
-	'version'	=> require('version.php'),
-	'path'		=> 'index',
-	'updir'		=> 'upload',
-	'dbencrypt'	=> false,
-	'sqllog'	=> false,
-	'checksign'	=> false,			//列表请求是否验证
-	'memory_limit'	=> '',			//运行内存大小
-	'timeout'		=> -1,			//抄送时间(秒),-1默认的
-	'db_drive'		=> 'mysqli',	//数据库操作驱动
-	'db_engine'		=> 'MyISAM',	//数据库默认引擎
-	'debug'			=> true,	//默认debug模式
-	'reim_show' 	=> true,	//首页是否显示REIM
-	'mobile_show' 	=> true,	//首页是否显示手机版
-	'accesslogs' 	=> false,	//是否记录访问日志和限制IP
-	'upurl'			=> '', 		//上传文件附件地址(还不能使用)
-	'authorkey'		=> '', 		//系统授权的key，请联系官网获取
-	'companymode'	=> false, 	//是否开启多单位模式切换
-    'encrypt_key' => 'INJq4HXEGI',
-    'base_url' => 'http://jz-test.gonn.com.cn/'
-
-);
-//引入配置文件
-$_confpath		= $rock->strformat('?0/?1/?1Config.php', ROOT_PATH, PROJECT);
-if(file_exists($_confpath)){
-	$_tempconf	= require($_confpath);
-	foreach($_tempconf as $_tkey=>$_tvs)$config[$_tkey] = $_tvs;
-	if(isempt($config['url']))$config['url'] = $rock->url();
-	if(!isempt($config['memory_limit']) && function_exists('ini_set'))
-		ini_set('memory_limit', $config['memory_limit']);
-	if($config['timeout']>-1 && function_exists('set_time_limit'))set_time_limit($config['timeout']);	
-}
-$_confpath	= ''.ROOT_PATH.'/config/author.php';
-if(file_exists($_confpath)){
-	$config['authorkey'] = require($_confpath);
-}
-
-define('DEBUG', $config['debug']);
-error_reporting(DEBUG ? E_ALL : 0);
-
-define('TITLE', $config['title']);
-define('URL', $config['url']);
-define('URLY', $config['urly']);
-define('PATH', $config['path']);
-
-define('DB_DRIVE', $config['db_drive']);
-define('DB_HOST', $config['db_host']);
-define('DB_USER', $config['db_user']);
-define('DB_PASS', $config['db_pass']);
-define('DB_BASE', $config['db_base']);
-
-define('UPDIR', $config['updir']);
-define('PREFIX', $config['perfix']);
-define('QOM', $config['qom']);
-define('VERSION', $config['version']);
-define('HIGHPASS', $config['highpass']);
-define('SYSURL', ''.URL.PATH.'.php');
-define('UPURL', $config['upurl']);
-define('ISMORECOM', $config['companymode']);
-define('ENCRYPT_KEY',$config['encrypt_key']);
-
-$_confpath	= ''.ROOT_PATH.'/config/iplogs.php'; //这个用来限制IP访问的
-if(file_exists($_confpath))include_once($_confpath);
-$rock->initRock();

webmain/task/openapi/opencustomerAction.php

@@ -14,12 +14,20 @@ class opencustomerClassAction extends openapiAction
 
     //客户列表
     public function listAction(){
-        $post = $_POST;
-        $page = $post['size'] ?  $post['size']:0;
-        $page_size = $post['page_size']? $post['page_size']:10;
-        $sort =$post['sort']? $post['sort']: 'desc';
-        $sql  = 'select id,contract_number,name from [Q]customer as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
+     $post = $_POST;
+        $email=$post['email'];
+        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
         $data = $this->db->getall($sql);
+        $uid=$data[0]['id'];//用户id
+        $data = $this->db->getall('select id,contract_number,name from 
+                                    oa_customer 
+                                    where (uid = ' . $uid . '
+                                        or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
+                                    or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
+                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
+                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
+                                    and status = 1 
+                                    order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]customer_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]contracts  where mid='.$vo['id'];

webmain/task/openapi/opensupplierAction.php

@@ -15,11 +15,17 @@ class opensupplierClassAction extends openapiAction
     //供应商列表
     public function listAction(){
         $post = $_POST;
-        $page = $post['size'] ?  $post['size']:0;
-        $page_size = $post['page_size']? $post['page_size']:10;
-        $sort =$post['sort']? $post['sort']: 'desc';
-        $sql  = 'select id,number,name from [Q]supplier as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
+        $email=$post['email'];
+        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
         $data = $this->db->getall($sql);
+        $uid=$data[0]['id'];//用户id
+        $data = $this->db->getall('select id,number,name from oa_supplier where (uid = ' . $uid . '
+                or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
+                or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
+                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
+                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
+                and status = 1 
+                order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]supplier_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]supplier_contract   where mid='.$vo['id'];

webmain/webmainConfig.php

-<?php
-if(!defined('HOST'))die('not access');
-//[管理员]在2020-01-02 19:23:44通过[系统→系统工具→系统设置]，保存修改了配置文件
-return array(
-	'url'	=> 'http://oa.gonn.com.cn/',	//系统URL
-	'localurl'	=> '',	//本地系统URL，用于服务器上浏览地址
-	'title'	=> '广厦网络OA办公系统(测试-test)',	//系统默认标题
-	'apptitle'	=> '广厦网络OA（测试-test）',	//APP上和手机网页版上的标题
-	'db_host'	=> '192.168.1.71',	//数据库地址
-	'db_user'	=> 'root',	//数据库用户名
-	'db_pass'	=> 'aLN%4Jx7ZsmsoMlOB0XEd7',	//数据库密码
-	'db_base'	=> 'oa',	//数据库名称
-	'db_engine'	=> 'MyISAM',
-	'perfix'	=> 'oa_',	//数据库表名前缀
-#	'qom'	=> 'oa_',	//session、cookie前缀
-	'qom'	=> '',	//session、cookie前缀
-	'highpass'	=> '',	//超级管理员密码，可用于登录任何帐号
-	'db_drive'	=> 'mysqli',	//操作数据库驱动有mysql,mysqli,pdo三种
-	'randkey'	=> 'zbxmrnlidsugyohaqejkfvpctw',	//系统随机字符串密钥
-	'asynkey'	=> 'ed42c6c72f7b5f9779e03921e335adc7',	//这是异步任务key
-	'openkey'	=> '5bdfcedb618e1e03abf18e391278c1f4',	//对外接口openkey
-	'updir'	=> 'upload',
-	'sqllog'	=> true,	//是否记录sql日志保存upload/sqllog下
-	'asynsend'	=> '0',	//是否异步发送提醒消息，0同步，1自己服务端异步，2官网VIP用户异步
-	'editpass'	=> '1',	//用户登录修改密码：0不用修改，1强制用户必须修改
-	'install'	=> true,	//已安装，不要去掉啊
-	'outurl'	=> '',	//这个地址当你内网地址访问时向手机推送消息的地址
-	'reimtitle'	=> '',	//REIM即时通信上标题
-	'qqmapkey'	=> '',
-	'xinhukey'	=> '9c204945d725d0766f9fcb0ead720515',	//信呼官网key，用于在线升级使用
-	'bcolorxiang'	=> '',	//单据详情页面上默认展示线条的颜色
-	'officeyl'	=> '0',	//文档Excel.Doc预览类型,0自己部署插件，1使用官网支持任何平台
-	'useropt'	=> '1',	//1记录用户操作保存到日志里,空不记录
-	'defstype'	=> '1',	//PC后台主题皮肤，可以设置1到34
-	'debug'	=> true,	//为true调试开发模式,false上线模式
-	'reim_show'	=> false,	//首页是否显示REIM
-	'mobile_show'	=> true,	//首页是否显示手机版
-	'companymode'	=> true,	//多单位模式，true就是开启
-	'loginyzm'	=> '0',	//登录方式:0仅使用帐号+密码,1帐号+密码/手机+验证码,2帐号+密码+验证码,3仅使用手机+验证码
-
-);