diff --git a/README.md b/README.md index e5177ad..54a61e4 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ 公司团队:信呼开发团队 官网网站:http://www.rockoa.com/ 源码仅供学习二次开发使用,禁止二次发布,禁止用于商业用途出售等(违者必究) -版权:Copyright @2016-2022 信呼开发团队 -版本整理时间:2022-11-17 23:59:59 -版本号:V2.5.1 +版权:Copyright @2016-2023 信呼开发团队 +版本整理时间:2023-01-12 23:59:59 +版本号:V2.5.2 -### V2.5.1更新说明 +### V2.5.2更新说明 1、完善系统安全性。 2、更多升级日志详见:http://www.rockoa.com/view_core.html diff --git a/config/version.php b/config/version.php index 3dba2dc..076b865 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ '; } if($type=='uploadimg'){ + $str1= '搴撲腑閫 '; + if(M=='login' || $this->adminid==0 || $a['attr']=='onlychange')$str1=''; $str = ''; $str.= ''; - $str.= '
 
'; + $str.= '
 '.$str1.'
'; } if($type=='uploadfile'){ $str = ''; - $str.= '
'; + $str.= '
'; $str.= ''; } if($type=='graph'){ diff --git a/js/dingwei.js b/js/dingwei.js index f12e2d0..250d539 100644 --- a/js/dingwei.js +++ b/js/dingwei.js @@ -118,6 +118,8 @@ js.dw = { js.dw.ondwerr(msg); }else{ this.wait('娴忚鍣ㄥ畾浣嶄腑...'); + //鏈湴铏氭嫙瀹氫綅 + if(HOST=='127.0.0.1'){this.showPosition({coords:{latitude:24.51036967,longitude:118.178837299,accuracy:100}});return;} navigator.geolocation.getCurrentPosition(this.showPosition,this.showError,{ enableHighAccuracy: true, timeout: 19000, diff --git a/mode/bootstrapplugin/jquery-bootstable.js b/mode/bootstrapplugin/jquery-bootstable.js index 02a57b5..ab1bdd3 100644 --- a/mode/bootstrapplugin/jquery-bootstable.js +++ b/mode/bootstrapplugin/jquery-bootstable.js @@ -358,7 +358,7 @@ s+='
'; } s+='
'; - if(!can.cellautosave)s+='
纭畾    鍙栨秷
'; + if(!can.cellautosave || b.noautosave)s+='
纭畾    鍙栨秷
'; s+=''; s+='
'; s+=''; @@ -372,12 +372,12 @@ if(e.keyCode==13)this.blur(); }); var arr = {oldvalue:v,fields:fields,type:b.type,id:a.id,obj:o,row:row} - if(can.cellautosave){ - $(o3).blur(function(){ + if(!can.cellautosave || b.noautosave){ + $('#inputeditsave_'+rand+'').click(function(){ me._editforcuschen(this, arr, b); }); }else{ - $('#inputeditsave_'+rand+'').click(function(){ + $(o3).blur(function(){ me._editforcuschen(this, arr, b); }); } diff --git a/web/res/js/jquery-changeuser.js b/web/res/js/jquery-changeuser.js index 0f979d3..60a31f4 100644 --- a/web/res/js/jquery-changeuser.js +++ b/web/res/js/jquery-changeuser.js @@ -372,9 +372,15 @@ }; this._loaddatashow=function(ret){ if(isempt(this.changerange) && isempt(this.changerangeno)){ - js.setoption('deptjson', ret.deptjson); - js.setoption('userjson', ret.userjson); - js.setoption('groupjson', ret.groupjson); + if(ret.iscache=='1'){ + js.setoption('deptjson', ''); + js.setoption('userjson', ''); + js.setoption('groupjson', ''); + }else{ + js.setoption('deptjson', ret.deptjson); + js.setoption('userjson', ret.userjson); + js.setoption('groupjson', ret.groupjson); + } } this.userarr = js.decode(ret.userjson); this.deptarr = js.decode(ret.deptjson); @@ -519,8 +525,11 @@ this.showdata=function(a,inb){ if(!a)a=[]; this.showselectdata(a.selectdata); + var len = 0; + if(a.totalCount)len=a.totalCount; if(a.rows)a = a.rows; - var s='',len=a.length,s1=''; + if(len==0)len=a.length; + var s='',s1=''; if(len==0){ s='
鏃犺褰
'; }else{ @@ -603,13 +612,21 @@ }); }; this._searchkeys=function(e){ - clearTimeout(this._searchkeystime); - this._searchkeystime=setTimeout(function(){ - me._searchkey(false); - },500); + if(!this.searchajax){ + clearTimeout(this._searchkeystime); + this._searchkeystime=setTimeout(function(){ + me._searchkey(false); + },500); + }else{ + if(e.keyCode==13)this._searchkey(false); + } }; this._searchkey = function(bo){ var key = $('#changekey_'+this.rand+'').val(),a=[],d=[],d1,len,i,oi=0,s; + if(this.searchajax){ + this.loaddata(''+this.selvalue+'&key='+jm.base64encode(key)+''); + return; + } a=this.data; if(a.rows)a=a.rows; len=a.length;if(len==0)return; diff --git a/webmain/flow/input/inputAction.php b/webmain/flow/input/inputAction.php index 77c6642..7fdc16f 100644 --- a/webmain/flow/input/inputAction.php +++ b/webmain/flow/input/inputAction.php @@ -891,6 +891,7 @@ class inputAction extends Action $souarr = array(); $this->input= c('input'); + $this->flow = $flow; foreach($flow->fieldsarra as $k=>$rs){ if($rs['issou']==1){ diff --git a/webmain/flow/input/inputjs/input_two.js b/webmain/flow/input/inputjs/input_two.js index c13e080..a0e1cb9 100644 --- a/webmain/flow/input/inputjs/input_two.js +++ b/webmain/flow/input/inputjs/input_two.js @@ -137,7 +137,7 @@ var inputtwo={ }, initupss:function(sna){ if(isedit==0 || this.initupssa[sna])return; - var o,o1,sna,tsye,uptp='image'; + var o,o1,tsye,uptp='image'; o1 = get('filed_'+sna+'');tsye=$(o1).attr('tsye');tdata=$(o1).attr('tdata'); if(tsye=='file'){ uptp='*'; @@ -223,13 +223,49 @@ var inputtwo={ } }, //澶氭枃浠剁偣鍑讳笂浼 - uploadfilei:function(sna){ + outusebool:false, + uploadfilei:function(sna,ssi){ if(isedit==0)return; var ts = this.uploadfileibefore(sna); if(ts){js.msg('msg',ts);return;} if(this.upfbo){js.msg('msg','璇风瓑寰呬笂浼犲畬鎴愬湪娣诲姞');return;} - this.initupss(sna); - get('filed_'+sna+'_inp').click(); + if(!this.outusebool && ssi!='onlychange'){ + js.alert('

'); + return; + } + this.uploadfileis(sna,0); + + }, + uploadfileis:function(sna,lx){ + js.tanclose('confirm'); + if(lx==0){ + this.initupss(sna); + get('filed_'+sna+'_inp').click(); + }else if(!this.outusebool){ + var o1,tsye,uptp='image'; + o1 = get('filed_'+sna+'');tsye=$(o1).attr('tsye');tdata=$(o1).attr('tdata'); + if(tsye=='file'){ + uptp='*'; + if(!isempt(tdata))uptp=tdata; + } + $.selectdata({ + title:'鏂囦欢搴撲腑閫夋嫨',fid:sna,tsye:tsye,searchajax:true,checked:false, + url:'api.php?m=upload&a=changedata&uptp='+uptp+'&tsye='+tsye+'', + onselect:function(seld,sna,sid){ + if(seld){ + if(this.tsye=='img'){ + get('imgview_'+this.fid+'').src = seld.filepath; + form(this.fid).value=seld.filepath; + }else{ + c.showfileup(this.fid, seld); + c.showupid(this.fid); + } + } + } + }); + }else{ + js.msg('msg','鏃犳硶鎿嶄綔'); + } }, //涓婁紶瀹屾垚 showupid:function(sna){ @@ -258,7 +294,7 @@ var inputtwo={ if(jg=='yes'){ o.remove(); c.showupid(sna); - $.get(js.getajaxurl('delfile','upload','public',{id:fid})); + if(!f.xuanbool)$.get(js.getajaxurl('delfile','upload','public',{id:fid})); } }); } diff --git a/webmain/flow/input/mode_jiabanAction.php b/webmain/flow/input/mode_jiabanAction.php index 7e52c07..40b62a9 100644 --- a/webmain/flow/input/mode_jiabanAction.php +++ b/webmain/flow/input/mode_jiabanAction.php @@ -13,5 +13,11 @@ class mode_jiabanClassAction extends inputAction{ $this->returnjson(array($sj, '', $jiafee)); } + + + protected function savebefore($table, $arr, $id, $addbo){ + $msg = m('kaoqin')->leavepan($arr['uid'], '', $arr['stime'], $arr['etime'], 0, $id,'鍔犵彮'); + return $msg; + } } \ No newline at end of file diff --git a/webmain/flow/input/mode_userinfoAction.php b/webmain/flow/input/mode_userinfoAction.php index 943c6af..31e40d6 100644 --- a/webmain/flow/input/mode_userinfoAction.php +++ b/webmain/flow/input/mode_userinfoAction.php @@ -66,7 +66,10 @@ class mode_userinfoClassAction extends inputAction{ unset($uarr['quitdt']); } - if($uarr)m('admin')->update($uarr, $id); + if($uarr){ + m('admin')->update($uarr, $id); + c('cache')->del('deptuserjson'); + } } //鑾峰彇鎵撳紑璁板綍 diff --git a/webmain/flow/input/tpl_input_lu.html b/webmain/flow/input/tpl_input_lu.html index ba6aa84..1d11efd 100644 --- a/webmain/flow/input/tpl_input_lu.html +++ b/webmain/flow/input/tpl_input_lu.html @@ -50,6 +50,7 @@ echo 'body{--main-color:'.$maincolor.';--main-border:rgba('.$maincolors.',0.2)}' .btn:hover{opacity:1;color:#ffffff} .ke-icon-crop{background-image: url(mode/icons/crop.png);width: 16px;height: 16px;} .xuhao{text-align:center;} +.xuhao[readonly]{background:none} diff --git a/webmain/install/rockxinhu.sql b/webmain/install/rockxinhu.sql index 6d8fe4f..8ecf707 100644 --- a/webmain/install/rockxinhu.sql +++ b/webmain/install/rockxinhu.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50610 File Encoding : 65001 -Date: 2022-11-17 16:17:30 +Date: 2023-01-11 17:56:58 */ SET FOREIGN_KEY_CHECKS=0; @@ -71,12 +71,12 @@ CREATE TABLE `xinhu_admin` ( -- ---------------------------- -- Records of xinhu_admin -- ---------------------------- -INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '绠$悊鍛', 'e10adc3949ba59abbe56e057f20f883e', '4926', '1', '1', '鐢', '0592-1234569', 'upload/face/1.jpg', '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '5', '纾愮煶', '椤圭洰涓荤', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1'); -INSERT INTO `xinhu_admin` VALUES ('2', null, 'diaochan', '璨傝潐', 'e10adc3949ba59abbe56e057f20f883e', '158', '1', '0', '濂', '0592-123456', null, '3', '璐㈠姟閮', null, null, null, '淇″懠寮鍙戝洟闃/璐㈠姟閮', '5', '纾愮煶', '璐㈠姟鎬荤洃', '1', '[1],[3]', '[5]', '1,3', '15800000007', '1', '2016-08-09', null, null, null, null, null, '0', 'diaochan', null, '2', '0', null, '1', null, null, '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '绠$悊鍛', 'e10adc3949ba59abbe56e057f20f883e', '5021', '1', '1', '鐢', '0592-1234569', 'upload/face/1.jpg', '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '5', '纾愮煶', '椤圭洰涓荤', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('2', null, 'diaochan', '璨傝潐', 'e10adc3949ba59abbe56e057f20f883e', '160', '1', '0', '濂', '0592-123456', null, '3', '璐㈠姟閮', null, null, null, '淇″懠寮鍙戝洟闃/璐㈠姟閮', '5', '纾愮煶', '璐㈠姟鎬荤洃', '1', '[1],[3]', '[5]', '1,3', '15800000007', '1', '2016-08-09', null, null, null, null, null, '0', 'diaochan', null, '2', '0', null, '1', null, null, '0', '1'); INSERT INTO `xinhu_admin` VALUES ('3', null, 'xiaoqiao', '灏忎箶', 'e10adc3949ba59abbe56e057f20f883e', '281', '1', '0', '濂', null, null, '3', '璐㈠姟閮', null, null, null, '淇″懠寮鍙戝洟闃/璐㈠姟閮', '2', '璨傝潐', '鍑虹撼', '1', '[1],[3]', '[5],[2]', '1', '15800000001', '1', '2017-05-02', null, '2016-08-30 20:34:23', null, null, null, '0', 'xiaoqiao', null, '2', '0', null, '1', null, null, '0', '1'); INSERT INTO `xinhu_admin` VALUES ('4', null, 'daqiao', '澶т箶', 'e10adc3949ba59abbe56e057f20f883e', '404', '1', '0', '濂', null, null, '4', '琛屾斂浜轰簨閮', '3', '璐㈠姟閮', '浼氳', '淇″懠寮鍙戝洟闃/琛屾斂浜轰簨閮', '5', '纾愮煶', '浜轰簨涓荤', '1', '[1],[4],[3]', '[5]', '1,3', '15800000002', '1', '2017-07-01', null, '2016-10-20 22:27:51', null, null, null, '0', 'daqiao', null, '2', '0', null, '1', null, null, '0', '1'); -INSERT INTO `xinhu_admin` VALUES ('5', null, 'rock', '纾愮煶', 'e10adc3949ba59abbe56e057f20f883e', '438', '1', '0', '鐢', null, null, '5', '绠$悊灞', null, null, null, '淇″懠寮鍙戝洟闃/绠$悊灞', null, null, '钁d簨闀', '0', '[1],[5]', null, '2,3', '15800000003', '1', '2015-11-01', null, null, null, null, null, '0', 'panshi', null, '1', '0', null, '1', null, '1,2,3,4', '0', '1'); -INSERT INTO `xinhu_admin` VALUES ('6', null, 'zhangfei', '寮犻', 'e10adc3949ba59abbe56e057f20f883e', '204', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '7', '璧靛瓙榫', '绋嬪簭鍛', '100', '[1],[2]', '[5],[1],[7]', '1', '15800000004', '1', '2017-07-01', null, '2016-11-01 20:15:52', null, null, null, '0', 'zhangfei', null, '1', '0', null, '1', null, null, '0', '0'); +INSERT INTO `xinhu_admin` VALUES ('5', null, 'rock', '纾愮煶', 'e10adc3949ba59abbe56e057f20f883e', '439', '1', '0', '鐢', null, null, '5', '绠$悊灞', null, null, null, '淇″懠寮鍙戝洟闃/绠$悊灞', null, null, '钁d簨闀', '0', '[1],[5]', null, '2,3', '15800000003', '1', '2015-11-01', null, null, null, null, null, '0', 'panshi', null, '1', '0', null, '1', null, '1,2,3,4', '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('6', null, 'zhangfei', '寮犻', 'e10adc3949ba59abbe56e057f20f883e', '205', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '7', '璧靛瓙榫', '绋嬪簭鍛', '100', '[1],[2]', '[5],[1],[7]', '1', '15800000004', '1', '2017-07-01', null, '2016-11-01 20:15:52', null, null, null, '0', 'zhangfei', null, '1', '0', null, '1', null, null, '0', '0'); INSERT INTO `xinhu_admin` VALUES ('7', null, 'zhaozl', '璧靛瓙榫', 'e10adc3949ba59abbe56e057f20f883e', '242', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠$悊鍛', '楂樼骇绋嬪簭鍛', '100', '[1],[2]', '[5],[1]', '1', '15800000005', '1', '2016-07-01', null, '2017-06-28 15:34:26', null, null, null, '0', 'zhaozilong', null, '1', '0', null, '1', null, null, '0', '0'); INSERT INTO `xinhu_admin` VALUES ('8', null, 'xinhu', '淇″懠瀹㈡湇', '6846860684f05029abccc09a53cd66f1', '421', '1', '1', '濂', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠$悊鍛', '瀹㈡湇', '200', '[1],[2]', '[5],[1]', '1,4', '15800000006', '1', '2018-12-12', null, null, null, 'rainrock829', null, '0', 'xinhukefu', null, '1', '0', null, '1', null, '2', '0', '1'); @@ -372,8 +372,8 @@ CREATE TABLE `xinhu_chargems` ( -- ---------------------------- -- Records of xinhu_chargems -- ---------------------------- -INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2022-11-17 16:17:21', null, '1'); -INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2022-11-17 16:17:21', null, '0'); +INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2023-01-11 17:56:48', null, '1'); +INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2023-01-11 17:56:48', null, '0'); -- ---------------------------- -- Table structure for `xinhu_city` @@ -856,16 +856,16 @@ CREATE TABLE `xinhu_editrecord` ( DROP TABLE IF EXISTS `xinhu_emailm`; CREATE TABLE `xinhu_emailm` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` smallint(6) DEFAULT '0' COMMENT '鐢ㄦ埛iD', - `title` varchar(220) DEFAULT NULL COMMENT '涓婚', + `uid` int(11) DEFAULT '0' COMMENT '鐢ㄦ埛iD', + `title` varchar(300) DEFAULT NULL COMMENT '涓婚', `content` longtext COMMENT '閭欢鍐呭', - `sendid` smallint(6) DEFAULT NULL, + `sendid` int(11) DEFAULT NULL, `sendname` varchar(100) DEFAULT NULL COMMENT '鍙戦佷汉', `senddt` datetime DEFAULT NULL COMMENT '鍙戦佹椂闂', `receid` varchar(2000) DEFAULT NULL, `recename` varchar(4000) DEFAULT NULL COMMENT '鎺ユ敹浜', `isturn` tinyint(1) DEFAULT '0' COMMENT '@0|鑽夌ǹ,1|宸插彂閫', - `hid` smallint(6) DEFAULT '0' COMMENT '@鍥炲id', + `hid` int(11) DEFAULT '0' COMMENT '@鍥炲id', `isfile` tinyint(1) DEFAULT '0' COMMENT '@鏄惁鏈夐檮浠', `applydt` date DEFAULT NULL, `message_id` varchar(100) DEFAULT NULL COMMENT '閭欢Id', @@ -974,7 +974,7 @@ CREATE TABLE `xinhu_file` ( `filepathout` varchar(500) DEFAULT NULL COMMENT '杩滅▼璺緞', `explain` varchar(200) DEFAULT NULL COMMENT '璇存槑', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='涓婁紶鏂囦欢璁板綍琛'; +) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='涓婁紶鏂囦欢璁板綍琛'; -- ---------------------------- -- Records of xinhu_file @@ -983,9 +983,6 @@ INSERT INTO `xinhu_file` VALUES ('1', null, '1', '绯荤粺logo.png', null, 'png', INSERT INTO `xinhu_file` VALUES ('2', null, '1', 'daiban.png', null, 'png', '2000', '2.21 KB', 'images/daiban.png', 'images/daiban.png', '1', '绠$悊鍛', '2016-11-23 22:26:26', '127.0.0.1', 'Chrome', 'word', '2', '19', '0', null, '0', null, '0', null, null, null, null); INSERT INTO `xinhu_file` VALUES ('3', '', '1', '淇″懠寮鍙戝洟闃熶粙缁.pptx', 'application/msword', 'pptx', '37837', '36.95 KB', 'http://www.rockoa.com/upload/upgfile/xinhuppt.pptx', '', '1', '绠$悊鍛', '2019-03-09 19:20:41', '127.0.0.1', 'Chrome', 'wordxie', '1', '16', '', '', '0', 'wordxie', '0', '', '4a79f31d1eeec342e97c50093eeda803', null, null); INSERT INTO `xinhu_file` VALUES ('4', '', '1', '淇″懠浣跨敤鏂囨。.docx', 'application/msword', 'docx', '10840', '10.59 KB', 'http://www.rockoa.com/upload/upgfile/xinhuuse.docx', '', '1', '绠$悊鍛', '2019-03-09 20:45:33', '127.0.0.1', 'Chrome', 'wordxie', '2', '6', '', '', '0', 'wordxie', '0', '', '044de19ffa3b1d74fe5db901c587c06f', null, null); -INSERT INTO `xinhu_file` VALUES ('5', null, '1', '鍛樺伐鍔冲姩鍚堝悓.docx', 'application/msword', 'docx', '1000', '10KB', 'http://www.rockoa.com/upload/upgfile/xinhuhetong.docx', null, '1', '绠$悊鍛', '2020-10-28 19:44:34', '127.0.0.1', 'Chrome', 'wordxie', '4', '0', null, 'upload/2022-10/25_17364744_temp.pdf', '0', 'wordxie', '0', null, 'eb043a7b7067f10735d3a0bf256a073f', null, null); -INSERT INTO `xinhu_file` VALUES ('6', null, '1', '鏍囧噯绾㈠ご鏂囦欢妯$増.docx', 'application/msword', 'docx', '17979', '17.56 KB', 'http://www.rockoa.com/upload/upgfile/hongwj.docx', null, '1', '绠$悊鍛', '2020-10-31 22:16:15', '127.0.0.1', 'Chrome', 'wordxie', '5', '0', null, 'upload/2022-10/24_11412983_temp.pdf', '0', 'wordxie', '1', null, 'a192b95275b47cf467f08262a28cc9db', null, null); -INSERT INTO `xinhu_file` VALUES ('7', null, '1', '瀹㈡埛鍚堝悓妯$増.docx', 'application/msword', 'docx', '24064', '23.50 KB', 'http://www.rockoa.com/upload/upgfile/custhetong.docx', null, '1', '绠$悊鍛', '2020-12-18 12:21:53', '127.0.0.1', 'Chrome', 'wordxie', '6', '0', null, 'upload/2022-04/08_15454752_temp.pdf', '0', 'wordxie', '1', null, 'd49da14ee17d2e8dfac481ca827844ad', null, null); -- ---------------------------- -- Table structure for `xinhu_files` @@ -1154,12 +1151,12 @@ CREATE TABLE `xinhu_flow_bill` ( `isdel` tinyint(4) DEFAULT '0' COMMENT '鏄惁鍒犻櫎', `nstatus` tinyint(1) DEFAULT '0' COMMENT '褰撳墠鐘舵佸', `applydt` date DEFAULT NULL COMMENT '鐢宠鏃ユ湡', - `nstatustext` varchar(100) DEFAULT NULL COMMENT '褰撳墠鐘舵', + `nstatustext` varchar(500) DEFAULT NULL COMMENT '褰撳墠鐘舵', `status` tinyint(1) DEFAULT '0', `nowcourseid` int(11) DEFAULT '0' COMMENT '褰撳墠姝ラId', `nowcheckid` varchar(500) DEFAULT NULL COMMENT '褰撳墠瀹℃牳浜篿d', `nowcheckname` varchar(500) DEFAULT NULL COMMENT '褰撳墠瀹℃牳浜', - `checksm` varchar(200) DEFAULT NULL COMMENT '鏈鍚庡鏍歌鏄', + `checksm` varchar(500) DEFAULT NULL COMMENT '鏈鍚庡鏍歌鏄', `updt` datetime DEFAULT NULL COMMENT '鏈鍚庢洿鏂版椂闂', `createdt` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿', `tuiid` int(11) DEFAULT '0' COMMENT '閫鍥瀎low_log.Id', @@ -1169,7 +1166,7 @@ CREATE TABLE `xinhu_flow_bill` ( KEY `table` (`table`,`mid`) USING BTREE, KEY `status` (`status`), KEY `modeid` (`modeid`) -) ENGINE=MyISAM AUTO_INCREMENT=374 DEFAULT CHARSET=utf8 COMMENT='娴佺▼鍗曟嵁'; +) ENGINE=MyISAM AUTO_INCREMENT=377 DEFAULT CHARSET=utf8 COMMENT='娴佺▼鍗曟嵁'; -- ---------------------------- -- Records of xinhu_flow_bill @@ -1184,7 +1181,7 @@ INSERT INTO `xinhu_flow_bill` VALUES ('8', 'KB-20160827-0001', 'kqinfo', '7', '6 INSERT INTO `xinhu_flow_bill` VALUES ('9', 'KD-20160827-0001', 'kqout', '1', '23', '澶栧嚭鍑哄樊', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2016-08-27 15:22:51', '1', '绠$悊鍛', '5', '0', '1', '2016-08-27', '纾愮煶閫氳繃', '1', '0', null, null, null, null, null, '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('10', 'KA-20160830-0001', 'kqinfo', '8', '5', '璇峰亣鏉', '寮犻', '6', '0', '寮鍙戦儴', '2016-08-30 20:12:33', '6', '寮犻', '4,6,1', '0', '1', '2016-08-30', '澶т箶澶勭悊閫氳繃', '1', '0', null, null, '濂界殑', null, null, '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('235', 'WA-20200331-001', 'goodm', '17', '24', '鐗╁搧棰嗙敤', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2020-03-31 22:18:38', '1', '绠$悊鍛', '4', '0', '1', '2020-03-31', '澶т箶澶勭悊鍙戞斁', '1', '0', null, null, null, '2020-03-31 22:18:46', '2020-03-31 22:18:38', '0', '1'); -INSERT INTO `xinhu_flow_bill` VALUES ('119', 'WB-20171112-0001', 'goodm', '3', '28', '鐗╁搧閲囪喘', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2018-02-07 23:05:49', '1', '绠$悊鍛', '5,4', '0', '1', '2017-11-12', '寰呯鐭冲鐞', '0', '20', '5', '纾愮煶', null, '2018-08-29 16:44:39', '2017-11-12 18:37:02', '0', '1'); +INSERT INTO `xinhu_flow_bill` VALUES ('119', 'WB-20171112-0001', 'goodm', '3', '28', '鐗╁搧閲囪喘', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2023-01-10 19:26:41', '1', '绠$悊鍛', '5,4', '0', '1', '2017-11-12', '纾愮煶澶勭悊鍚屾剰', '1', '0', null, null, null, '2023-01-10 19:26:50', '2017-11-12 18:37:02', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('18', 'FA-20160902-0001', 'fininfom', '5', '11', '璐圭敤鎶ラ攢', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2016-09-12 14:52:28', '1', '绠$悊鍛', '4,5,2', '0', '1', '2016-09-02', '寰呰矀铦夊鐞', '0', '9', '2', '璨傝潐', null, '2019-06-04 10:59:38', null, '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('19', 'FA-20160508-0001', 'fininfom', '4', '26', '鍊熸鍗', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2016-09-03 15:43:28', '1', '绠$悊鍛', '2,4,5', '0', '1', '2016-05-08', '璨傝潐澶勭悊閫氳繃', '1', '0', null, null, null, null, null, '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('20', 'FB-20160505-0001', 'fininfom', '3', '25', '鍑哄樊鎶ラ攢', '绠$悊鍛', '1', '0', '寮鍙戦儴', '2016-09-03 11:43:36', '1', '绠$悊鍛', '2,8,5,4', '0', '1', '2016-05-05', '璨傝潐澶勭悊閫氳繃', '1', '0', null, null, null, null, null, '0', '1'); @@ -1286,7 +1283,7 @@ INSERT INTO `xinhu_flow_bill` VALUES ('324', 'PL-20220902001', 'planm', '2', '13 INSERT INTO `xinhu_flow_bill` VALUES ('325', 'PL-20220904001', 'planm', '3', '133', '宸ヤ綔璁″垝', '澶т箶', '4', '4', '琛屾斂浜轰簨閮', '2022-09-04 12:17:25', '4', '澶т箶', '4', '0', '1', '2022-09-04', '澶т箶澶勭悊鍙戝竷', '1', '0', null, null, null, '2022-09-04 12:19:01', '2022-09-04 12:17:25', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('327', 'CF-20220916-001', 'planm', '5', '134', '鍥哄畾璧勪骇棰嗙敤', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-09-16 10:37:03', '1', '绠$悊鍛', '1,4', '0', '1', '2022-09-16', '绠$悊鍛樺鐞嗗悓鎰', '1', '0', null, null, null, '2022-09-16 10:37:23', '2022-09-16 10:37:03', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('328', 'CF-20220916-002', 'planm', '6', '134', '鍥哄畾璧勪骇棰嗙敤', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-09-16 12:15:17', '1', '绠$悊鍛', '4', '0', '1', '2022-09-16', '澶т箶澶勭悊鍚屾剰', '1', '0', null, null, null, '2022-09-16 14:28:12', '2022-09-16 12:15:17', '0', '1'); -INSERT INTO `xinhu_flow_bill` VALUES ('329', 'KB-20220916-001', 'kqinfo', '160', '6', '鍔犵彮鍗', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-09-16 20:26:43', '1', '绠$悊鍛', '5', '0', '0', '2022-09-16', '寰呯鐭冲鐞', '0', '3', '5', '纾愮煶', null, '2022-09-16 20:26:43', '2022-09-16 20:26:43', '0', '1'); +INSERT INTO `xinhu_flow_bill` VALUES ('329', 'KB-20220916-001', 'kqinfo', '160', '6', '鍔犵彮鍗', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-12-06 18:56:23', '1', '绠$悊鍛', '5', '0', '0', '2022-09-16', '寰呯鐭冲鐞', '0', '3', '5', '纾愮煶', null, '2022-12-06 18:56:23', '2022-09-16 20:26:43', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('360', 'CO-20220921001', 'planm', '7', '135', '淇℃伅鏀堕泦', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-09-21 19:26:19', '1', '绠$悊鍛', '5', '0', '1', '2022-09-21', '纾愮煶澶勭悊鍚屾剰', '1', '0', null, null, null, '2022-09-21 19:26:57', '2022-09-21 19:26:19', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('361', 'CP-20220921001', 'planm', '8', '136', '淇℃伅鏀堕泦琛', '绠$悊鍛', '1', '2', '寮鍙戦儴', '2022-09-21 19:28:20', '1', '绠$悊鍛', '1', '0', '1', '2022-09-21', '绠$悊鍛樺鐞嗗悓鎰', '1', '0', null, null, null, '2022-09-21 19:30:44', '2022-09-21 19:27:08', '0', '1'); INSERT INTO `xinhu_flow_bill` VALUES ('362', 'CP-20220921002', 'planm', '9', '136', '淇℃伅鏀堕泦琛', '寮犻', '6', '2', '寮鍙戦儴', '2022-11-11 21:37:18', '6', '寮犻', '1', '0', '1', '2022-09-21', '绠$悊鍛樺鐞嗗悓鎰', '1', '0', null, null, null, '2022-11-17 10:45:42', '2022-09-21 19:27:08', '0', '1'); @@ -1309,7 +1306,7 @@ CREATE TABLE `xinhu_flow_chao` ( KEY `modeid` (`modeid`), KEY `uid` (`uid`), KEY `table` (`table`,`mid`) USING BTREE -) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='鎶勯佽〃'; +) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='鎶勯佽〃'; -- ---------------------------- -- Records of xinhu_flow_chao @@ -1326,8 +1323,8 @@ CREATE TABLE `xinhu_flow_checks` ( `mid` int(11) DEFAULT NULL, `modeid` smallint(6) DEFAULT '0', `courseid` int(11) DEFAULT '0', - `checkid` varchar(100) DEFAULT NULL, - `checkname` varchar(100) DEFAULT NULL, + `checkid` varchar(500) DEFAULT NULL, + `checkname` varchar(500) DEFAULT NULL, `optid` smallint(6) DEFAULT '0', `optname` varchar(20) DEFAULT NULL, `optdt` datetime DEFAULT NULL, @@ -1355,10 +1352,10 @@ CREATE TABLE `xinhu_flow_cname` ( `id` int(11) NOT NULL AUTO_INCREMENT, `num` varchar(30) DEFAULT NULL COMMENT '缂栧彿', `name` varchar(50) DEFAULT NULL COMMENT '瀹℃牳缁勫悕', - `checkid` varchar(50) DEFAULT NULL, - `checkname` varchar(50) DEFAULT NULL COMMENT '瀹℃牳浜', + `checkid` varchar(500) DEFAULT NULL, + `checkname` varchar(500) DEFAULT NULL COMMENT '瀹℃牳浜', `pid` int(11) DEFAULT '0' COMMENT '涓婄骇ID', - `receid` varchar(300) DEFAULT NULL, + `receid` varchar(500) DEFAULT NULL, `recename` varchar(500) DEFAULT NULL COMMENT '閫傜敤瀵硅薄', `sort` smallint(6) DEFAULT '0' COMMENT '鎺掑簭鍙', PRIMARY KEY (`id`), @@ -1415,7 +1412,7 @@ CREATE TABLE `xinhu_flow_course` ( `csfwid` varchar(200) DEFAULT NULL, PRIMARY KEY (`id`), KEY `setid` (`setid`) -) ENGINE=MyISAM AUTO_INCREMENT=148 DEFAULT CHARSET=utf8 COMMENT='娴佺▼姝ラ琛'; +) ENGINE=MyISAM AUTO_INCREMENT=150 DEFAULT CHARSET=utf8 COMMENT='娴佺▼姝ラ琛'; -- ---------------------------- -- Records of xinhu_flow_course @@ -1552,7 +1549,7 @@ CREATE TABLE `xinhu_flow_element` ( PRIMARY KEY (`id`), KEY `mid` (`mid`), KEY `fields` (`fields`) -) ENGINE=MyISAM AUTO_INCREMENT=1573 DEFAULT CHARSET=utf8 COMMENT='妯″潡鍏冪礌'; +) ENGINE=MyISAM AUTO_INCREMENT=1701 DEFAULT CHARSET=utf8 COMMENT='妯″潡鍏冪礌'; -- ---------------------------- -- Records of xinhu_flow_element @@ -2216,7 +2213,7 @@ INSERT INTO `xinhu_flow_element` VALUES ('694', '72', '鐢宠鏃ユ湡', 'applydt', INSERT INTO `xinhu_flow_element` VALUES ('695', '72', '璇存槑', 'explain', 'textarea', '9', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('696', '72', '寮瑰嚭涓 鎷夊崟閫', 'tanxuan', 'selectdatafalse', '10', null, '0', 'tanxuan,tanxuanid', '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('697', '72', '寮规涓 鎷夊閫', 'tanxuancheck', 'selectdatatrue', '12', null, '0', 'tanxuancheck', '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, null, '0', '0', '0', null); -INSERT INTO `xinhu_flow_element` VALUES ('698', '72', '鏂囦欢涓婁紶1', 'upfile1', 'uploadfile', '13', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); +INSERT INTO `xinhu_flow_element` VALUES ('698', '72', '鏂囦欢涓婁紶1', 'upfile1', 'uploadfile', '13', null, '0', 'doc,docx,pdf', '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('699', '72', '鏂囦欢涓婁紶2', 'upfile2', 'uploadfile', '14', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('700', '69', '姝f枃鏂囦欢', 'filecontid', 'uploadfile', '6', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('701', '73', '浠撳簱鍚嶇О', 'depotname', 'text', '0', null, '1', null, '1', '1', null, '0', '0', null, null, '50', null, '1', '0', '0', '1', '0', null, null, '0', '0', '0', null); @@ -2468,7 +2465,7 @@ INSERT INTO `xinhu_flow_element` VALUES ('976', '43', 'E', 'ane', 'text', '8', n INSERT INTO `xinhu_flow_element` VALUES ('975', '63', '鍗曚綅缂栧彿', 'num', 'text', '3', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, '涓嶈兘鏈夊ぇ鍐欏瓧姣', '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('977', '56', '鍒ゆ柇棰樻暟', 'pdshu', 'number', '7', '0', '0', null, '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('978', '56', '鎿嶄綔浜', 'optname', 'text', '15', null, '0', null, '0', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '1', '0', null, null, '0', '0', '0', null); -INSERT INTO `xinhu_flow_element` VALUES ('979', '72', '灏侀潰鍥剧墖', 'fengmian', 'uploadimg', '5', null, '0', null, '1', '1', null, '0', '0', null, null, '200', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); +INSERT INTO `xinhu_flow_element` VALUES ('979', '72', '灏侀潰鍥剧墖', 'fengmian', 'uploadimg', '5', null, '0', null, '1', '1', 'onlychange', '0', '0', null, null, '200', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('980', '2', '涓绘寔浜', 'zcren', 'changeusercheck', '2', null, '0', 'zcrenid', '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '1', '0', null, '涓虹┖榛樿鍙戣捣浜轰富鎸', '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('981', '72', '缂栧彿', 'num', 'num', '2', null, '1', 'ABCYmd', '1', '1', 'readonly', '0', '0', null, null, '50', null, '1', '0', '0', '0', '0', null, null, '0', '0', '0', null); INSERT INTO `xinhu_flow_element` VALUES ('982', '69', '闇鏌ラ槄浜', 'recename', 'text', '9', null, '0', null, '0', '0', null, '0', '0', null, null, '0', null, '1', '0', '0', '1', '0', null, null, '0', '0', '0', null); @@ -2653,7 +2650,7 @@ CREATE TABLE `xinhu_flow_extent` ( `fieldstr` varchar(500) DEFAULT NULL COMMENT '鐩稿叧瀛楁', PRIMARY KEY (`id`), KEY `modeid` (`modeid`) -) ENGINE=MyISAM AUTO_INCREMENT=276 DEFAULT CHARSET=utf8 COMMENT='妯″潡鏉冮檺'; +) ENGINE=MyISAM AUTO_INCREMENT=278 DEFAULT CHARSET=utf8 COMMENT='妯″潡鏉冮檺'; -- ---------------------------- -- Records of xinhu_flow_extent @@ -2850,21 +2847,8 @@ INSERT INTO `xinhu_flow_extent` VALUES ('203', '鍏ㄤ綋浜哄憳', 'all', '86', '3', INSERT INTO `xinhu_flow_extent` VALUES ('204', '鍏ㄤ綋浜哄憳', 'all', '86', '0', null, null, '1', '228', null); INSERT INTO `xinhu_flow_extent` VALUES ('205', '鍏ㄤ綋浜哄憳', 'all', '86', '0', null, null, '1', '227', null); INSERT INTO `xinhu_flow_extent` VALUES ('206', '鍏ㄤ綋浜哄憳', 'all', '86', '5', null, null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('207', '鍏ㄤ綋浜哄憳', 'all', '75', '0', 'YG9wdGlkYD17dWlkfQ::', null, '1', '0', null); INSERT INTO `xinhu_flow_extent` VALUES ('208', '绠$悊鍛', 'u1', '2', '2', 'YHR5cGVgPTE:', null, '1', '0', null); INSERT INTO `xinhu_flow_extent` VALUES ('209', '绠$悊鍛', 'u1', '2', '3', 'YHR5cGVgPTEg', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('210', '绠$悊鍛', 'u1', '29', '5', null, null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('211', '鍏ㄤ綋浜哄憳', 'all', '10', '6', 'MT0x', null, '0', '0', 'workdate,mobile,tel,email'); -INSERT INTO `xinhu_flow_extent` VALUES ('213', '绠$悊鍛樼粍', 'g4', '11', '5', null, null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('214', '绠$悊鍛樼粍', 'g4', '34', '5', null, null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('215', '绠$悊鍛', 'u1', '88', '2', 'MT0x', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('216', '绠$悊鍛', 'u1', '88', '3', 'MT0x', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('217', '鍏ㄤ綋浜哄憳', 'all', '88', '2', 'YG9wdGlkYD17dWlkfQ::', '鍙互缂栬緫鎴戝彂甯', '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('218', '鍏ㄤ綋浜哄憳', 'all', '88', '3', 'YG9wdGlkYD17dWlkfQ::', '鍙互鍒犻櫎鎴戝彂甯', '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('219', '鍏ㄤ綋浜哄憳', 'all', '88', '0', 'MT0x', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('225', '澶т箶', 'u4', '31', '1', 'YWxs', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('226', '鍏ㄤ綋浜哄憳', 'all', '5', '7', 'e3N1cGVyfQ::', null, '1', '0', null); -INSERT INTO `xinhu_flow_extent` VALUES ('229', '绠$悊鍛樼粍', 'g4', '72', '7', 'MT0x', null, '1', '0', null); INSERT INTO `xinhu_flow_extent` VALUES ('234', '绠$悊鍛', 'u1', '22', '5', null, null, '1', '0', null); INSERT INTO `xinhu_flow_extent` VALUES ('239', '鍏ㄤ綋浜哄憳', 'all', '74', '0', 'e3JlY2VpZH0:', null, '1', '0', null); INSERT INTO `xinhu_flow_extent` VALUES ('240', '鍏ㄤ綋浜哄憳', 'all', '75', '0', 'e3NoYXRlaWQscmVjZWFsbH0:', '鍏变韩缁欏搴斾汉', '1', '0', null); @@ -2913,7 +2897,7 @@ CREATE TABLE `xinhu_flow_log` ( `iszb` tinyint(1) DEFAULT '0' COMMENT '鏄惁杞姙璁板綍', PRIMARY KEY (`id`), KEY `table` (`table`,`mid`) -) ENGINE=MyISAM AUTO_INCREMENT=4527 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎿嶄綔璁板綍'; +) ENGINE=MyISAM AUTO_INCREMENT=4567 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎿嶄綔璁板綍'; -- ---------------------------- -- Records of xinhu_flow_log @@ -3389,6 +3373,8 @@ INSERT INTO `xinhu_flow_log` VALUES ('4500', 'project', '1', '0', null, '鏇存柊 INSERT INTO `xinhu_flow_log` VALUES ('4501', 'project', '1', '0', null, '鏇存柊杩涘害', '0', '2022-10-25 11:16:28', '寰堝ソ寰堝ソ', '192.168.1.70', 'wxbro', '绠$悊鍛', '1', '22', null, '1', '0', null, '0'); INSERT INTO `xinhu_flow_log` VALUES ('4502', 'project', '1', '0', null, '鏇存柊杩涘害', '0', '2022-10-25 11:17:44', '鍝堝搱', '192.168.1.70', 'Chrome', '绠$悊鍛', '1', '22', null, '1', '0', null, '0'); INSERT INTO `xinhu_flow_log` VALUES ('4503', 'project', '1', '0', null, '鏇存柊杩涘害', '0', '2022-10-25 11:28:12', null, '127.0.0.1', 'Chrome', '绠$悊鍛', '1', '22', null, '1', '0', null, '0'); +INSERT INTO `xinhu_flow_log` VALUES ('4558', 'goodm', '3', '2', '涓嶅悓鎰', '琛屾斂瀹℃壒', '20', '2023-01-10 19:26:07', '鍢垮樋', 'unknow', 'Chrome', '纾愮煶', '5', '28', 'red', '1', '2', null, '0'); +INSERT INTO `xinhu_flow_log` VALUES ('4560', 'goodm', '3', '1', '鍚屾剰', '琛屾斂瀹℃壒', '20', '2023-01-10 19:26:50', null, 'unknow', 'Chrome', '纾愮煶', '5', '28', 'green', '1', '2', null, '0'); -- ---------------------------- -- Table structure for `xinhu_flow_menu` @@ -3459,9 +3445,6 @@ INSERT INTO `xinhu_flow_menu` VALUES ('41', '鐩稿叧椤圭洰淇℃伅', null, '0', nul INSERT INTO `xinhu_flow_menu` VALUES ('42', '褰掕繕鐧昏', null, '0', '褰掕繕', null, '1', null, '41', null, null, '1', '1', '0', '1', null, null, 'YHN0YXRlYD0wLGB1c2VpZGA9JzAnLGB1c2VuYW1lYD1udWxs', '0'); INSERT INTO `xinhu_flow_menu` VALUES ('43', '鍋滅敤浼氳', 'tynoup', '0', null, 'gray', '0', null, '2', 'YHR5cGVgPTEgYW5kIGBzdGF0dXNgPTE:', '鍥哄畾浼氳鍋滅敤鐨', '1', '1', '0', '1', null, null, 'YHN0YXR1c2A9MA::', '0'); INSERT INTO `xinhu_flow_menu` VALUES ('44', '鍚敤浼氳', 'qynoup', '0', null, 'green', '0', null, '2', 'YHR5cGVgPTEgYW5kIGBzdGF0dXNgPTA:', '鍥哄畾浼氳鍚敤', '1', '1', '0', '1', null, null, 'YHN0YXR1c2A9MQ::', '0'); -INSERT INTO `xinhu_flow_menu` VALUES ('45', '鍒嗛厤缁...', null, '10', null, null, '0', '鍒嗛厤', '7', 'YHVpZGA9MA::', null, '1', '1', '0', '2', null, null, 'YHVpZGA9e2NuYW1laWR9LGBpc2doYD0w', '0'); -INSERT INTO `xinhu_flow_menu` VALUES ('54', '鍒涘缓鏀舵鍗', null, '0', null, 'chocolate', '0', null, '92', 'YHN0YXR1c2A9MSBhbmQgYGlzcGF5YD0wIGFuZCBgY3VzdHJhY3RpZGA9MA::', '鏈叧鑱斿悎鍚岄渶瑕佸垱寤烘敹娆惧崟', '1', '0', '0', '5', null, null, 'YWRkfGN1c3RmaW5hfGRlZl9odGlkPS17aWR9JmRlZl90eXBlPTA:', '0'); -INSERT INTO `xinhu_flow_menu` VALUES ('56', '鏍囪瘑宸插畬鎴', 'bywc', '0', '宸插畬鎴', 'green', '1', null, '98', 'YHVpZGA9e3VpZH0gYW5kICBgc3RhdHVzYD0w', null, '1', '1', '0', '1', null, null, 'c3RhdHVzPTEsZmluZHQ9bm93KCk:', '0'); INSERT INTO `xinhu_flow_menu` VALUES ('57', '鏌ョ湅姹囨', null, '0', null, 'blue', '0', null, '101', 'YHVpZGA9e3VpZH0:', null, '1', '0', '0', '5', null, null, 'eGlhbmd8d2VuanVhbnxtaWQ9e2lkfSZobHg9dHJ1ZQ::', '0'); INSERT INTO `xinhu_flow_menu` VALUES ('60', '鎾ゅ洖閭欢', 'chemail', '0', null, 'red', '0', '鎾ゅ洖', '47', 'YHVpZGA9e3VpZH0:', null, '1', '1', '0', '1', null, null, null, '1'); INSERT INTO `xinhu_flow_menu` VALUES ('61', '缂栬緫鏂囨。', 'editfile', '0', null, null, '0', null, '86', null, null, '1', '0', '0', '7', null, null, 'b3BlbnhpZWVkaXRmaWxl', '0'); @@ -3583,7 +3566,7 @@ CREATE TABLE `xinhu_flow_set` ( `sortdir` varchar(50) DEFAULT NULL COMMENT '榛樿鎺掑簭', `isys` tinyint(1) DEFAULT '0' COMMENT '鎻愯棰勫', PRIMARY KEY (`id`,`num`) -) ENGINE=MyISAM AUTO_INCREMENT=143 DEFAULT CHARSET=utf8 COMMENT='娴佺▼妯″潡'; +) ENGINE=MyISAM AUTO_INCREMENT=155 DEFAULT CHARSET=utf8 COMMENT='娴佺▼妯″潡'; -- ---------------------------- -- Records of xinhu_flow_set @@ -3615,7 +3598,7 @@ INSERT INTO `xinhu_flow_set` VALUES ('24', '鐗╁搧棰嗙敤', 'goodly', '82', 'good INSERT INTO `xinhu_flow_set` VALUES ('25', '鍑哄樊鎶ラ攢', 'finccbx', '91', 'fininfom', 'type=1', '鎶ラ攢閲戦:{money},鐩殑:{purpose},鎴愭灉:{purresult}', null, '璐㈠姟', '1', '0', '0', '0', 'FB-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2017-05-06 21:29:35', '1', '1', 'fininfos', '鎶ラ攢鏄庣粏', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('26', '鍊熸鍗', 'finjkd', '92', 'fininfom', 'type=2', '鍊熸閲戦:{money},鐢ㄩ:{purpose}', null, '璐㈠姟', '1', '0', '0', '0', 'FC-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2017-05-06 21:45:31', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('27', '杩樻鍗', 'finhkd', '93', 'fininfom', 'type=3', '杩樻閲戦锛歿money}锛岃繕娆炬柟寮:{paytype}锛岃繕娆惧埌锛歿fullname}', null, '璐㈠姟', '1', '0', '0', '0', 'FD-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2017-05-06 21:45:35', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); -INSERT INTO `xinhu_flow_set` VALUES ('28', '鐗╁搧閲囪喘', 'caigou', '83', 'goodm', 'type=1', '浠嶽{custname}]閲囪喘閲戦:{money}鍏冿紝閲囪喘鐗╁搧锛歿wupinlist}', 'cont:渚涘簲鍟嗭細{custname}[br]閲囪喘鐗╁搧锛歿wupinlist}[br]閲戦锛歿money}鍏', '鐗╁搧', '1', '0', '0', '0', 'WB-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2019-04-29 11:16:52', '1', '1', 'goodn', '閲囪喘鐗╁搧', null, '0', '0', '1', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('28', '鐗╁搧閲囪喘', 'caigou', '83', 'goodm', 'type=1', '浠嶽{custname}]閲囪喘閲戦:{money}鍏冿紝閲囪喘鐗╁搧锛歿wupinlist}', 'cont:渚涘簲鍟嗭細{custname}[br]閲囪喘鐗╁搧锛歿wupinlist}[br]閲戦锛歿money}鍏', '鐗╁搧', '1', '0', '0', '0', 'WB-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2023-01-10 19:25:35', '1', '1', 'goodn', '閲囪喘鐗╁搧', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('29', '浜哄憳妗f', 'userinfo', '60', 'userinfo', null, null, null, '浜轰簨', '0', '0', '0', '0', null, '0', 'all', '鍏ㄤ綋浜哄憳', '2019-06-03 17:07:09', '1', '0', 'userinfos,userinfos', '宸ヤ綔缁忓巻,鏁欒偛缁忓巻', null, '0', '0', '0', '1', '0', '0', '1', '0', '0', '0', '1', '1', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('30', '鑰冨嫟淇℃伅', 'leavehr', '34', 'kqinfo', null, null, null, '鑰冨嫟', '1', '0', '0', '0', null, '0', 'd4', '琛屾斂浜轰簨閮', '2016-09-13 13:46:55', '1', '0', null, null, null, '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('31', '鍛樺伐鍚堝悓', 'userract', '61', 'userract', null, null, null, '浜轰簨', '1', '0', '0', '0', null, '0', 'all', '鍏ㄤ綋浜哄憳', '2019-06-06 17:57:19', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); @@ -3687,9 +3670,9 @@ INSERT INTO `xinhu_flow_set` VALUES ('122', '瀹㈡埛鏈嶅姟', 'custfuwu', '57', 'c INSERT INTO `xinhu_flow_set` VALUES ('57', '浠樻鍗', 'custfinb', '54', 'custfina', 'type=1', '鏃ユ湡[{dt}],{custname},{ispay}', 'title:{custname}\noptdt:{optdt}\ncont:閲戦锛歿money}[br]瀵瑰簲鍚堝悓锛歿htnum}', '瀹㈡埛', '0', '0', '0', '0', 'CD-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2022-05-25 20:56:37', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('133', '宸ヤ綔璁″垝', 'planm', '30', 'planm', 'type=0', '{name}锛屾墽琛屼汉锛歿runren}', 'title:{name}\ncont:鎵ц浜猴細{runren}[br]寮濮嬫椂闂达細{startdt}[br]璇勫浜猴細{psren}[br]鎵ц鐘舵侊細{state}', '鍩虹', '0', '0', '0', '0', 'PL-Ymd', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-09-09 16:54:30', '1', '1', 'plans', '璁″垝浜嬮」', '寰?澶勭悊,宸插彂甯,鏈氳繃', '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('134', '鍥哄畾璧勪骇棰嗙敤', 'assetmly', '7', 'planm', 'type=1', '棰嗙敤鑰咃細{runren}锛岄鐢ㄨ祫浜э細{contentlist}', 'cont:棰嗙敤鑰咃細{runren}[br]棰嗙敤璧勪骇锛歿contentlist}[br]棰嗙敤鐘舵侊細{state}', '琛屾斂', '0', '0', '0', '0', 'CF-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-09-15 22:29:55', '1', '1', 'plans', '棰嗙敤璧勪骇', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); -INSERT INTO `xinhu_flow_set` VALUES ('135', '淇℃伅鏀堕泦', 'collectm', '17', 'planm', 'type=2', '[{fenlei}]{name}锛屾敹闆嗗璞★細{runren}锛寋explain}', 'title:{name}\noptdt:{startdt}\ncont:绫诲瀷锛歿fenlei}[br]鏀堕泦瀵硅薄锛歿runren}[br]浜烘暟锛歿leixing}[br]璇存槑锛歿explain}', '琛屾斂', '1', '0', '0', '0', 'CO-Ymd', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-11-11 22:22:10', '1', '0', 'plans', '鏀堕泦瀛楁', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); -INSERT INTO `xinhu_flow_set` VALUES ('136', '淇℃伅鏀堕泦琛', 'collects', '18', 'planm', 'type=3', '{name}锛岃瘎瀹′汉锛歿psren}', 'title:{name}\noptdt:{startdt}\ncont:璇勫浜猴細{psren}[br]鎴鏃堕棿锛歿enddt}', '琛屾斂', '1', '0', '0', '0', 'CP-Ymd', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-09-20 21:09:08', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); -INSERT INTO `xinhu_flow_set` VALUES ('142', '鍋ュ悍鎶ュ', 'yqhealthy', '350', 'yuqingm', null, null, null, '鐤儏', '0', '0', '0', '0', 'YQ-Ymd', '0', 'all', '鍏ㄤ綋浜哄憳', '2022-11-03 15:50:15', '1', '1', null, null, null, '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('135', '淇℃伅鏀堕泦', 'collectm', '17', 'planm', 'type=2', '[{fenlei}]{name}锛屾敹闆嗗璞★細{runren}锛寋explain}', 'title:{name}\noptdt:{startdt}\ncont:绫诲瀷锛歿fenlei}[br]鏀堕泦瀵硅薄锛歿runren}[br]浜烘暟锛歿leixing}[br]璇存槑锛歿explain}', '琛屾斂', '1', '0', '0', '0', 'CO-Ymd', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-11-11 22:22:10', '1', '1', 'plans', '鏀堕泦瀛楁', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('136', '淇℃伅鏀堕泦琛', 'collects', '18', 'planm', 'type=3', '{name}锛岃瘎瀹′汉锛歿psren}', 'title:{name}\noptdt:{startdt}\ncont:璇勫浜猴細{psren}[br]鎴鏃堕棿锛歿enddt}', '琛屾斂', '1', '0', '0', '0', 'CP-Ymd', '1', 'all', '鍏ㄤ綋浜哄憳', '2022-09-20 21:09:08', '1', '0', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('142', '鍋ュ悍鎶ュ', 'yqhealthy', '350', 'yuqingm', null, null, null, '鐤儏', '0', '0', '0', '0', 'YQ-Ymd', '0', 'all', '鍏ㄤ綋浜哄憳', '2022-11-03 15:50:15', '0', '1', null, null, null, '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); -- ---------------------------- -- Table structure for `xinhu_flow_todo` @@ -3726,7 +3709,7 @@ CREATE TABLE `xinhu_flow_todo` ( `bohuiz` tinyint(1) DEFAULT '0' COMMENT '鍥炴墽鏃', `tosuper` tinyint(1) DEFAULT '0' COMMENT '鐩村睘涓婄骇', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁閫氱煡璁剧疆琛'; +) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁閫氱煡璁剧疆琛'; -- ---------------------------- -- Records of xinhu_flow_todo @@ -3748,6 +3731,7 @@ INSERT INTO `xinhu_flow_todo` VALUES ('20', '璇佷欢鍒版湡鎻愰啋', null, '108', n INSERT INTO `xinhu_flow_todo` VALUES ('21', '浜嬮」閫炬湡鎻愰啋', null, '115', null, '319', '1', null, null, null, null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'runrenid', '鏈畬鎴愮殑鈥渰title}鈥濅簨椤瑰嵆灏嗛炬湡銆', '1', '0', '0', '0'); INSERT INTO `xinhu_flow_todo` VALUES ('22', '鍛樺伐鍚堝悓鍒版湡鎻愰啋', null, '31', null, '144', '0', 'u4', '澶т箶', null, null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '浜哄憳{uname}鐨勨渰httype}{name}鈥濆皢鍐峽enddt}鍒版湡', '1', '0', '0', '0'); INSERT INTO `xinhu_flow_todo` VALUES ('23', null, '璋冩嫧鍏ュ簱鎻愰啋', '132', null, '357', '1', null, null, null, null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'uid', '浣犳湁缂栧彿{num}鐨勫晢鍝佽皟鎷ㄥ叆搴撻渶瑕佸幓鎻愪氦鍏ュ簱銆', '0', '0', '0', '0'); +INSERT INTO `xinhu_flow_todo` VALUES ('24', '浼氳绾鎻愰啋', null, '54', null, '0', '1', null, null, null, null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'joinid', '{optname}鎻愪氦浜嗕富棰樷渰title}鈥濈殑浼氳绾銆', '0', '0', '0', '0'); -- ---------------------------- -- Table structure for `xinhu_flow_todos` @@ -3797,7 +3781,7 @@ CREATE TABLE `xinhu_flow_where` ( `syrname` varchar(200) DEFAULT NULL COMMENT '姝ゆ潯浠跺彲閫傜敤瀵硅薄', PRIMARY KEY (`id`), KEY `setid` (`setid`) -) ENGINE=MyISAM AUTO_INCREMENT=392 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鏉′欢'; +) ENGINE=MyISAM AUTO_INCREMENT=421 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鏉′欢'; -- ---------------------------- -- Records of xinhu_flow_where @@ -4156,7 +4140,7 @@ CREATE TABLE `xinhu_goodm` ( -- ---------------------------- INSERT INTO `xinhu_goodm` VALUES ('1', '1', null, '2017-11-11 15:43:29', '1', '绠$悊鍛', '2017-11-11', null, '1', '1', '1', '26456.00', '0', null, '10.00', '1', '0', '0', '0', null); INSERT INTO `xinhu_goodm` VALUES ('17', '1', null, '2020-03-31 22:18:38', '1', '绠$悊鍛', '2020-03-31', null, '1', '1', '0', '0.00', '0', null, '0.00', '1', '0', '0', '1', null); -INSERT INTO `xinhu_goodm` VALUES ('3', '1', null, '2018-02-07 23:05:49', '1', '绠$悊鍛', '2017-11-12', '杩欏彧鏄祴璇曡屽凡鎷夈', '0', '1', '1', '14400.00', '3', '寰蒋鍏徃', '0.00', '0', '0', '0', '0', null); +INSERT INTO `xinhu_goodm` VALUES ('3', '1', null, '2023-01-10 19:26:41', '1', '绠$悊鍛', '2017-11-12', '杩欏彧鏄祴璇曡屽凡鎷夈', '1', '1', '1', '14400.00', '3', '寰蒋鍏徃', '0.00', '0', '0', '0', '1', null); INSERT INTO `xinhu_goodm` VALUES ('4', '1', null, '2017-11-13 14:20:47', '1', '绠$悊鍛', '2017-11-13', null, '1', '1', '1', '24.00', '0', null, '0.00', '1', '0', '0', '0', null); INSERT INTO `xinhu_goodm` VALUES ('5', '1', null, '2017-12-28 14:26:46', '1', '绠$悊鍛', '2017-12-28', '鍡棷鍡', '1', '1', '3', '0.00', '1', '榛樿浠撳簱', '0.00', '1', '0', '0', '0', null); INSERT INTO `xinhu_goodm` VALUES ('6', '1', null, '2018-01-27 10:27:28', '1', '绠$悊鍛', '2018-01-27', null, '1', '1', '3', '0.00', '1', '榛樿浠撳簱', '0.00', '1', '0', '0', '0', null); @@ -4196,7 +4180,7 @@ CREATE TABLE `xinhu_goodn` ( INSERT INTO `xinhu_goodn` VALUES ('1', '1', '3', '22', '22', '0', '鍙', '1200.00', '0', '0'); INSERT INTO `xinhu_goodn` VALUES ('2', '1', '5', '33', '33', '1', '鏀', '2.00', '0', '0'); INSERT INTO `xinhu_goodn` VALUES ('24', '17', '3', '2', '2', '0', null, '0.00', '1', '2'); -INSERT INTO `xinhu_goodn` VALUES ('4', '3', '3', '12', '0', '0', '鍙', '1200.00', '0', '0'); +INSERT INTO `xinhu_goodn` VALUES ('4', '3', '3', '12', '0', '0', '鍙', '1200.00', '1', '0'); INSERT INTO `xinhu_goodn` VALUES ('5', '4', '5', '12', '12', '0', '鏀', '2.00', '0', '0'); INSERT INTO `xinhu_goodn` VALUES ('6', '5', '3', '2', '2', '0', null, '0.00', '0', '0'); INSERT INTO `xinhu_goodn` VALUES ('7', '5', '6', '33', '33', '1', null, '0.00', '0', '0'); @@ -5046,7 +5030,7 @@ CREATE TABLE `xinhu_im_groupuser` ( `uid` int(11) NOT NULL DEFAULT '0', `istx` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=150 DEFAULT CHARSET=utf8 COMMENT='IM浼氳瘽浜哄憳'; +) ENGINE=MyISAM AUTO_INCREMENT=151 DEFAULT CHARSET=utf8 COMMENT='IM浼氳瘽浜哄憳'; -- ---------------------------- -- Records of xinhu_im_groupuser @@ -5063,7 +5047,7 @@ INSERT INTO `xinhu_im_groupuser` VALUES ('104', '31', '1', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('135', '2', '4', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('134', '2', '3', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('133', '2', '2', '1'); -INSERT INTO `xinhu_im_groupuser` VALUES ('100', '2', '5', '1'); +INSERT INTO `xinhu_im_groupuser` VALUES ('150', '2', '5', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('101', '2', '6', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('102', '2', '7', '1'); INSERT INTO `xinhu_im_groupuser` VALUES ('103', '2', '8', '1'); @@ -5101,13 +5085,13 @@ CREATE TABLE `xinhu_im_history` ( -- ---------------------------- -- Records of xinhu_im_history -- ---------------------------- -INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2022-11-17 15:39:11', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2022-11-17 15:39:12', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2023-01-11 17:25:38', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -- ---------------------------- -- Table structure for `xinhu_im_menu` @@ -5348,7 +5332,7 @@ CREATE TABLE `xinhu_im_mess` ( -- ---------------------------- -- Records of xinhu_im_mess -- ---------------------------- -INSERT INTO `xinhu_im_mess` VALUES ('1', '2022-11-17 15:39:11', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null); +INSERT INTO `xinhu_im_mess` VALUES ('1', '2023-01-11 17:25:38', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null); -- ---------------------------- -- Table structure for `xinhu_im_messzt` @@ -5428,7 +5412,7 @@ CREATE TABLE `xinhu_infor` ( -- ---------------------------- INSERT INTO `xinhu_infor` VALUES ('1', '娆㈣繋浣跨敤淇″懠宸ヤ綔鍙', '2018-04-26 17:27:10', '閫氱煡鍏憡', '

\n 娆㈣繋浣跨敤锛屾湁浠讳綍闂鍙互闅忔椂鑱旂郴鎴戜滑锛屽府浣犺В绛斿摝銆 \n

\n

\n 淇″懠鏄竴娆惧紑婧愬厤璐圭殑宸ヤ綔鍙拌蒋浠讹紝鍙坊鍔犲簲鐢紝绠$悊锛宲c涓婏紝app閮藉彲浠ヤ娇鐢紝鎴戜滑鐨勪唬鐮佸叏閮ㄥ紑鏀撅紝鍙嚜鐢变娇鐢ㄣ俓n

', null, null, null, '1', '绠$悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2016-08-01', '1', null, '0', '0', '0', '0', null, null, '0', '0', '0'); INSERT INTO `xinhu_infor` VALUES ('2', '鍏充簬鍐欐棩鎶ュ埗搴﹁鏄', '2019-04-13 19:54:43', '瑙勫垯鍒跺害', '

\n 1銆佹瘡涓汉宸ヤ綔鏃ュ湪涓嬬彮鍚庡繀椤诲啓宸ヤ綔鏃ユ姤锛屽叏澶╄鍋囧彲涓嶇敤鍐欙紝鍙鏈変笂鐝氨闇瑕佸啓锛屽嵆浣夸綘涓婄彮1鍒嗛挓銆俓n

\n

\n 2銆佷篃鍙互闅斿ぉ鍐欍俓n

\n

\n 鏈啓澶勭綒 \n

\n

\n 1銆佹湭鍐欎竴娆℃墸浜斿潡锛岀疮璁″姞鍊嶃俓n

', null, 'u1,u2,u3,u4,u5,u6,u7,u8,u9', null, '1', '绠$悊鍛', null, null, '浜哄姏琛屾斂閮', '2016-08-01', '1', 'images/kqbanner1.jpg', '0', '0', '0', '0', null, null, '0', '0', '0'); -INSERT INTO `xinhu_infor` VALUES ('6', '淇″懠鏇存柊鍙戝竷V2.5.1鐗堟湰', '2022-11-17 10:48:38', '閫氱煡鍏憡', '

\n 鐗堟湰娣诲姞浜嗗彂甯冨涓嬪姛鑳藉晩銆俓n

\n

\n 1銆佺郴缁熷姛鑳藉畬鍠勩俓n

\n

\n 2銆佹洿鏂颁簡寰堝锛岃嚜宸辩湅鍗囩骇鏃ュ織銆俓n

', 'http://www.rockoa.com/view_down.html', 'd1', '淇″懠寮鍙戝洟闃', '1', '绠$悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2022-11-17', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0'); +INSERT INTO `xinhu_infor` VALUES ('6', '淇″懠鏇存柊鍙戝竷V2.5.2鐗堟湰', '2023-01-11 11:03:06', '閫氱煡鍏憡', '

\n 鐗堟湰娣诲姞浜嗗彂甯冨涓嬪姛鑳藉晩銆俓n

\n

\n 1銆佺郴缁熷姛鑳藉畬鍠勩俓n

\n

\n 2銆佹洿鏂颁簡寰堝锛岃嚜宸辩湅鍗囩骇鏃ュ織銆俓n

', 'http://www.rockoa.com/view_down.html', 'd1', '淇″懠寮鍙戝洟闃', '1', '绠$悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2023-01-11', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0'); INSERT INTO `xinhu_infor` VALUES ('9', '浣犱滑瑙夊緱杩欎釜绯荤粺濡備綍锛', '2019-06-03 13:17:05', '閫氱煡鍏憡', '寮濮嬫姇绁ㄦ媺銆', null, 'd1', '淇″懠寮鍙戝洟闃', '1', '绠$悊鍛', '2018-08-31 12:42:00', '2017-08-26 12:42:00', '寮鍙戦儴', '2017-08-26', '1', null, '1', '1', '0', '0', '2019-04-15', null, '1', '0', '0'); -- ---------------------------- @@ -5705,7 +5689,7 @@ CREATE TABLE `xinhu_kqdw` ( -- ---------------------------- -- Records of xinhu_kqdw -- ---------------------------- -INSERT INTO `xinhu_kqdw` VALUES ('1', '鍘﹂棬榛樿浣嶇疆', '24.528153', '118.167806', '鍘﹂棬', '0', '12', null, '1', null, '1'); +INSERT INTO `xinhu_kqdw` VALUES ('1', '鍘﹂棬榛樿浣嶇疆', '24.528153', '118.167806', '鍘﹂棬', '0', '12', null, '1', null, '0'); -- ---------------------------- -- Table structure for `xinhu_kqerr` @@ -5764,7 +5748,7 @@ CREATE TABLE `xinhu_kqinfo` ( PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `kind` (`kind`) -) ENGINE=MyISAM AUTO_INCREMENT=161 DEFAULT CHARSET=utf8 COMMENT='璇峰亣鏉″姞鐝崟'; +) ENGINE=MyISAM AUTO_INCREMENT=163 DEFAULT CHARSET=utf8 COMMENT='璇峰亣鏉″姞鐝崟'; -- ---------------------------- -- Records of xinhu_kqinfo @@ -5815,7 +5799,7 @@ INSERT INTO `xinhu_kqinfo` VALUES ('154', '2', '璨傝潐', '2019-08-09 00:00:00', INSERT INTO `xinhu_kqinfo` VALUES ('155', '1', '绠$悊鍛', '2019-08-26 18:20:00', '2019-08-26 22:20:00', '鍔犵彮', null, '濂界殑', '1', '4.0', '2019-08-26 18:20:43', '1', '绠$悊鍛', '1', '2019-08-26', '0.00', '0', '0.00', null, '1'); INSERT INTO `xinhu_kqinfo` VALUES ('157', '2', '璨傝潐', '2020-07-01 13:59:00', '2020-07-31 13:59:00', '澧炲姞璋冧紤', null, null, '1', '8.0', '2020-07-16 13:59:49', '1', '绠$悊鍛', '1', '2020-07-16', '0.00', '0', '1.00', null, '1'); INSERT INTO `xinhu_kqinfo` VALUES ('158', '1', '绠$悊鍛', '2020-11-16 12:24:00', '2020-11-17 04:24:00', '鍔犵彮', null, '鍟﹀暒鍟', '1', '16.0', '2020-11-16 12:28:24', '1', '绠$悊鍛', '1', '2020-11-16', '0.00', '0', '0.00', null, '1'); -INSERT INTO `xinhu_kqinfo` VALUES ('160', '1', '绠$悊鍛', '2022-09-15 20:26:00', '2022-09-16 20:26:00', '鍔犵彮', null, '鍔犵彮銆', '0', '8.0', '2022-09-16 20:26:43', '1', '绠$悊鍛', '1', '2022-09-16', '0.00', '0', '0.00', null, '1'); +INSERT INTO `xinhu_kqinfo` VALUES ('160', '1', '绠$悊鍛', '2022-09-15 20:26:00', '2022-09-16 20:26:00', '鍔犵彮', null, '鍔犵彮銆', '0', '8.0', '2022-12-06 18:56:23', '1', '绠$悊鍛', '1', '2022-09-16', '0.00', '0', '0.00', null, '1'); -- ---------------------------- -- Table structure for `xinhu_kqjcmd` @@ -6165,7 +6149,7 @@ CREATE TABLE `xinhu_menu` ( `types` tinyint(1) DEFAULT '0', PRIMARY KEY (`id`), KEY `pid` (`pid`,`status`) -) ENGINE=MyISAM AUTO_INCREMENT=438 DEFAULT CHARSET=utf8 COMMENT='绯荤粺鑿滃崟'; +) ENGINE=MyISAM AUTO_INCREMENT=452 DEFAULT CHARSET=utf8 COMMENT='绯荤粺鑿滃崟'; -- ---------------------------- -- Records of xinhu_menu @@ -6176,7 +6160,7 @@ INSERT INTO `xinhu_menu` VALUES ('3', '鐢ㄦ埛绠$悊', '220', '2', 'flow,page,use INSERT INTO `xinhu_menu` VALUES ('4', '璁″垝浠诲姟', '46', '7', 'system,task', 'time', null, 'taskrun', '1', '1', null, '0', '0', '1', '0'); INSERT INTO `xinhu_menu` VALUES ('5', '缁勭鐞', '220', '3', 'system,group', 'group', null, 'group', '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('6', '缁勭粐缁撴瀯', '220', '1', 'system,dept', 'sitemap', null, null, '1', '1', null, '0', '0', '0', '0'); -INSERT INTO `xinhu_menu` VALUES ('7', '娴佺▼妯″潡', '0', '10', null, null, null, null, '1', '1', null, '0', '0', '0', '0'); +INSERT INTO `xinhu_menu` VALUES ('7', '娴佺▼妯″潡', '0', '15', null, null, null, null, '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('8', '鏉冮檺绠$悊', '1', '6', null, null, null, null, '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('9', '浜哄憳鈫掕彍鍗', '8', '0', 'system,extent,type=um', null, null, null, '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('10', '鑿滃崟鈫掍汉鍛', '8', '1', 'system,extent,type=mu', null, null, null, '1', '1', null, '0', '0', '0', '0'); @@ -6490,8 +6474,8 @@ INSERT INTO `xinhu_menu` VALUES ('413', '缁翠慨鎶ヤ慨鏌ョ湅', '411', '30', 'flow INSERT INTO `xinhu_menu` VALUES ('414', '淇℃伅鏀堕泦', '140', '10', null, null, null, null, '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('415', '淇℃伅鏀堕泦绠$悊', '414', '0', 'flow,page,collectm,atype=all,pnum=all', null, null, null, '1', '1', null, '0', '0', '0', '0'); INSERT INTO `xinhu_menu` VALUES ('416', '淇℃伅鏀堕泦琛', '414', '0', 'flow,page,collects,atype=all,pnum=all', null, null, null, '1', '1', null, '0', '0', '0', '0'); -INSERT INTO `xinhu_menu` VALUES ('436', '鍋ュ悍鎶ュ', '286', '4', 'flow,page,yqhealthy,atype=all,pnum=all', 'medkit', null, null, '1', '1', null, '0', '0', '0', '0'); -INSERT INTO `xinhu_menu` VALUES ('437', '鎴戠殑鍋ュ悍鎶ュ', '39', '10', 'flow,page,yqhealthy,atype=my', 'medkit', null, null, '0', '1', null, '0', '0', '0', '0'); +INSERT INTO `xinhu_menu` VALUES ('436', '鍋ュ悍鎶ュ', '286', '4', 'flow,page,yqhealthy,atype=all,pnum=all', 'medkit', null, null, '1', '0', null, '0', '0', '0', '0'); +INSERT INTO `xinhu_menu` VALUES ('437', '鎴戠殑鍋ュ悍鎶ュ', '39', '10', 'flow,page,yqhealthy,atype=my', 'medkit', null, null, '0', '0', null, '0', '0', '0', '0'); -- ---------------------------- -- Table structure for `xinhu_news` @@ -6603,7 +6587,7 @@ CREATE TABLE `xinhu_option` ( PRIMARY KEY (`id`), KEY `num` (`num`), KEY `pid` (`pid`) -) ENGINE=MyISAM AUTO_INCREMENT=821 DEFAULT CHARSET=utf8 COMMENT='绯荤粺閫夐」'; +) ENGINE=MyISAM AUTO_INCREMENT=846 DEFAULT CHARSET=utf8 COMMENT='绯荤粺閫夐」'; -- ---------------------------- -- Records of xinhu_option @@ -7081,6 +7065,26 @@ INSERT INTO `xinhu_option` VALUES ('814', '浼戝', '0', '809', null, '4', '0', INSERT INTO `xinhu_option` VALUES ('815', '楂樹竴', '0', '782', null, null, '0', null, '1', null, '0', null, null, null, '0'); INSERT INTO `xinhu_option` VALUES ('816', '楂樹簩', '0', '782', null, null, '1', null, '1', null, '0', null, null, null, '0'); INSERT INTO `xinhu_option` VALUES ('817', '楂樹笁', '0', '782', null, null, '2', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('819', '鐗╀笟閫夐」', '0', '1', 'wuye', null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('820', '鍏ヤ綇璺熶笟涓诲叧绯', '0', '819', 'wuyeguanxi', null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('821', '涓氫富', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('822', '澶', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('823', '鍎垮コ', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('824', '鐖舵瘝', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('825', '浜叉垰', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('826', '鏈嬪弸', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('827', '绉熷', '0', '820', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('828', '鐗╀笟閫氱煡绫诲瀷', '0', '819', 'wuyetypename', null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('829', '閫氱煡', '0', '828', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('830', '鐗╀笟鏈嶅姟鍒跺害', '0', '828', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('831', '瑁呬慨鐭ヨ瘑', '0', '828', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('832', '涓氫富鏈嶅姟绫诲瀷', '0', '819', 'wuyefwtype', null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('833', '鎶ヤ慨', '0', '832', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('834', '寤鸿', '0', '832', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('835', '鎶曡瘔', '0', '832', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('836', '鍙嶉', '0', '832', null, null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('837', '璁惧绫诲瀷', '0', '819', 'wuyesntype', null, '0', null, '1', null, '0', null, null, null, '0'); +INSERT INTO `xinhu_option` VALUES ('838', '鏈虹數璁惧', '0', '837', null, null, '0', null, '1', null, '0', null, null, null, '0'); -- ---------------------------- -- Table structure for `xinhu_planm` @@ -7592,7 +7596,7 @@ CREATE TABLE `xinhu_task` ( INSERT INTO `xinhu_task` VALUES ('1', '娴佺▼浠庢柊鍖归厤', '绯荤粺', 'flow,pipei', 'd,d', '00:10:00,12:10:00', '姣忓ぉ0,12鐐', '1', '0', null, null, '0', null, null, null, null, null); INSERT INTO `xinhu_task` VALUES ('2', '鏁版嵁澶囦唤', '绯荤粺', 'sys,beifen', 'd', '00:20:00', '姣忓ぉ鍑屾櫒00:20', '1', '0', null, null, '0', null, null, null, null, null); INSERT INTO `xinhu_task` VALUES ('3', '绯荤粺鍗囩骇鎻愰啋', '绯荤粺', 'sys,upgtx', 'd', '00:25:00', '姣忓ぉ鍑屾櫒00:25', '0', '0', null, null, '0', null, null, null, '1,8', '绠$悊鍛,淇″懠瀹㈡湇'); -INSERT INTO `xinhu_task` VALUES ('4', '5鍒嗛挓杩愯1娆', '绯荤粺', 'minute5,run', 'i5', '00', '姣5鍒嗛挓杩愯涓娆', '1', '1', '2022-11-17 15:40:00', null, '0', null, 'success', '杩欎釜鏄繀椤荤殑锛屼笉鍙垹闄ゅ仠鐢', null, null); +INSERT INTO `xinhu_task` VALUES ('4', '5鍒嗛挓杩愯1娆', '绯荤粺', 'minute5,run', 'i5', '00', '姣5鍒嗛挓杩愯涓娆', '1', '0', null, null, '0', null, null, '杩欎釜鏄繀椤荤殑锛屼笉鍙垹闄ゅ仠鐢', null, null); INSERT INTO `xinhu_task` VALUES ('5', '鑰冨嫟淇℃伅鎻愰啋', '鑰冨嫟', 'kaoqin,todo', 'd', '09:25:00', '姣忓ぉ9鐐', '1', '0', null, null, '21', null, null, '鍦ㄦā鍧椼愯冨嫟淇℃伅銆戜笅璁剧疆鎻愰啋鍒板摢浜涘钩鍙般', null, null); INSERT INTO `xinhu_task` VALUES ('6', '鐢ㄦ埛鏁版嵁鏇存柊', '鐢ㄦ埛', 'sys,dataup', 'd', '00:10:00', '姣忓ぉ', '1', '0', null, null, '1', null, null, null, null, null); INSERT INTO `xinhu_task` VALUES ('7', '鑰冨嫟鍒嗘瀽', '鑰冨嫟', 'kaoqin,anay', 'd', '02:15:00', '姣忓ぉ2鐐', '1', '0', null, null, '22', null, null, '鍒嗘瀽鍏ㄤ綋浜哄憳鏄ㄥぉ鐨勮冨嫟', null, null); @@ -8034,16 +8038,13 @@ CREATE TABLE `xinhu_wordxie` ( `isgk` tinyint(4) DEFAULT '0' COMMENT '鏄惁鍙浠栦汉閫夋嫨', `tplvar` varchar(500) DEFAULT NULL COMMENT '妯$増涓彉閲', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='鏂囨。鍗忎綔'; +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='鏂囨。鍗忎綔'; -- ---------------------------- -- Records of xinhu_wordxie -- ---------------------------- INSERT INTO `xinhu_wordxie` VALUES ('1', '淇″懠寮鍙戝洟闃熶粙缁', null, 'pptx', '绠$悊鍛', '1', '2019-03-09 20:35:22', '琛屾斂浜轰簨閮,寮鍙戦儴', 'd4,d2', '淇″懠寮鍙戝洟闃', 'd1', '1', '3', null, '0', '0', null); INSERT INTO `xinhu_wordxie` VALUES ('2', '淇″懠浣跨敤鏂囨。', null, 'docx', '绠$悊鍛', '1', '2019-08-18 19:16:51', '寮鍙戦儴', 'd2', '淇″懠寮鍙戝洟闃', 'd1', '1', '4', null, '1', '0', null); -INSERT INTO `xinhu_wordxie` VALUES ('4', '鍛樺伐鍔冲姩鍚堝悓', '鍛樺伐鍚堝悓', 'docx', '绠$悊鍛', '1', '2020-10-29 10:08:17', null, null, '淇″懠寮鍙戝洟闃', 'd1', '1', '5', '鍙緵鍛樺伐鍚堝悓浣跨敤', '1', '1', 'company,name,idnum,mobile'); -INSERT INTO `xinhu_wordxie` VALUES ('5', '鏍囧噯绾㈠ご鏂囦欢妯$増', '绾㈠ご鏂囦欢', 'docx', '绠$悊鍛', '1', '2020-10-31 22:10:30', null, null, '淇″懠寮鍙戝洟闃', 'd1', '1', '6', '鍙戞枃鍗曞绾娇鐢', '1', '1', 'officiatitle,num,title,zuncheng,content,applydt,keyword,unitname,chaoname,unitsame'); -INSERT INTO `xinhu_wordxie` VALUES ('6', '瀹㈡埛鍚堝悓妯$増', '瀹㈡埛鍚堝悓', 'docx', '绠$悊鍛', '1', '2020-12-24 22:11:35', null, null, '淇″懠寮鍙戝洟闃', 'd1', '1', '7', null, '1', '1', 'custname,startdt,enddt,money'); -- ---------------------------- -- Table structure for `xinhu_work` diff --git a/webmain/model/adminModel.php b/webmain/model/adminModel.php index 33c7a84..461dc51 100644 --- a/webmain/model/adminModel.php +++ b/webmain/model/adminModel.php @@ -426,6 +426,7 @@ class adminClassModel extends Model public function getuser($lx=0, $uid=0) { $fields = '`id`,`name`,`deptid`,`deptname`,`deptpath`,`groupname`,`deptallname`,`mobile`,`ranking`,`tel`,`face`,`sex`,`email`,`pingyin`,`deptids`,`isvcard`'; + $this->allshow = false; if($uid==0){ $uid = $this->adminid; $where = m('view')->viewwhere('user', $uid, 'id'); @@ -474,6 +475,10 @@ class adminClassModel extends Model //璇诲彇鎴戝彲鏌ョ湅鏉冮檺 if(contain($where,'1=1')){ $where = ''; + if($this->rock->get('gtype')=='change'){ + //$this->allshow = true; + //if(!ISMORECOM && c('cache')->get('deptuserjson'))return array(); + } }else{ $where = 'and ((1 '.$where.') or (`id`='.$uid.'))'; } @@ -541,6 +546,7 @@ class adminClassModel extends Model */ public function updateinfo($where='') { + if($where)c('cache')->del('deptuserjson'); $rows = $this->db->getall("select * from `[Q]admin` a where id>0 $where"); $total = $this->db->count; $cl = 0; diff --git a/webmain/model/deptModel.php b/webmain/model/deptModel.php index 034ce3e..9cf380e 100644 --- a/webmain/model/deptModel.php +++ b/webmain/model/deptModel.php @@ -122,6 +122,7 @@ class deptClassModel extends Model 'uarr' => $userarr, 'darr' => $deptarr, 'garr' => $garr, + 'isall'=> $admindb->allshow ); } diff --git a/webmain/model/flow/flow.php b/webmain/model/flow/flow.php index 0f3377e..8c2766f 100644 --- a/webmain/model/flow/flow.php +++ b/webmain/model/flow/flow.php @@ -5,7 +5,7 @@ * 缃戝潃锛歨ttp://www.rockoa.com/ * 绯荤粺鏂囦欢 */ - class flowModel extends Model { public $modenum; public $editcont= ''; public $id = 0; public $moders; public $modeid; public $modename; public $sericnum; public $billrs = array(); public $rs = array(); public $urs = array(); public $drs = array(); public $fieldsarr = array(); public $fieldsarra = array(); public $mwhere; public $mtable; public $uname; public $uid = 0; public $optid = 0; public $isflow = 0; public $ismobile= 0; public $minwidth= 100; public $inputwidth= 0; public $atype = ''; public $daochubo= false; public $companyid= 1; protected function flowinit(){} protected function flowchangedata(){} protected function flowchangetodo(){} protected function flowdeletebill($sm){} protected function flowzuofeibill($sm){} protected function flowsubmit($na, $sm){} protected function flowaddlog($arr){} protected function flowdatalog($arr){} protected function flowcheckbefore(){} protected function flowcheckafter($zt, $sm){} protected function flowcheckfinsh($zt){} protected function flowgetfields($lx){} protected function flowgetoptmenu($opt){} protected function flowcheckname($num){} protected function flowcoursejudge($num){} protected function flowoptmenu($ors, $crs){} protected function flowisreadqx(){return false;} protected function flowisdeleteqx(){return false;} protected function flowprintrows($r){return $r;} protected function flowsubdata($r, $lx=0){return $r;} protected function flownexttodo($type){return false;} protected function flowbillwhere($lx, $uid){return '';} protected $flowweixinarr = array(); protected $flowviewufieds = 'uid'; protected $flowcompanyidfieds = 'comid'; protected $flowfieldstype = 0; public function flowrsreplace($rs){return $rs;} public function flowrsreplace_we($row, $rs){return $row;} public function flowwesearchdata($lx){return array();} protected function flowrsreplaceedit($rs){return $rs;} protected $flowstatusarr = array(1); protected $subsubdatastyle = ''; protected $wherejoin = array(); public $defaultorder = ''; public $floweditother = false; public $xiangbordercolor = ''; public function echomsg($msg) { if(!isajax())exit($msg); showreturn('', $msg, 201); exit(); } public function flowfieldarr($farr, $lx){return $farr;} public function flowinputtpl($cont, $lx){return $cont;} public function flowviewtpl($cont, $lx){return $cont;} public function floweditoffice($frs, $ofrs){} public function initdata($num, $id=null) { if(is_array($num)){ $this->moders= $num; }else{ $this->moders = m('flow_set')->getone(is_numeric($num) ? $num : "`num`='$num'"); if(!$this->moders)$this->echomsg('妯″潡['.$num.']涓嶅瓨鍦紝璇峰埌[娴佺▼妯″潡鍒楄〃]涓嬫坊鍔'); } $this->daochubo = ($this->rock->post('execldown')=='true') ? true :false; $table = $this->moders['table']; $this->modeid = $this->moders['id']; $this->modenum = $this->moders['num']; $this->modename = $this->moders['name']; $this->isflow = (int)$this->moders['isflow']; $this->settable($table); $this->mtable = $table; $this->viewmodel = m('view'); $this->chaomodel = m('flow_chao'); $this->billmodel = m('flow_bill'); $this->todomodel = m('flow_todo'); $this->todosmodel = m('flowtodo'); $this->flogmodel = m('flow_log'); $this->checksmodel = m('flow_checks'); $this->cnamemodel = m('flowcname'); $this->wheremodel = m('where'); $this->adminmodel = m('admin'); $this->remindmodel = m('remind'); $this->option = m('option'); $this->companyid = $this->adminmodel->getcompanyid(); $this->tfieldsarra(); $this->mwhere = "`table`='$this->mtable' and `mid`=-1"; if(!$this->defaultorder){ $sortdir = arrvalue($this->moders, 'sortdir'); if(!isempt($sortdir))$this->defaultorder = str_replace(' ',',', $sortdir); } $this->flowinit(); if($id==null)return $this; $this->loaddata($id, true); return $this; } private function tfieldsarra() { $rows = m('flow_element')->getrows("`mid`='$this->modeid' and `iszb`=0",'`name`,`fields`,`isbt`,`iszs`,`fieldstype`,`savewhere`,`data`,`isdr`,`iszb`,`issou`,`islu`,`islb`,`isonly`,`attr`','`sort`'); $this->fieldsarr = array(); if($rows)foreach($rows as $k=>$rs){ if($rs['islu']==1)$this->fieldsarr[] = $rs; } $this->fieldsarra = $rows; } public function inputtitle() { return $this->moders['name']; } public function flowsearchfields() { $arr = array(); if($this->isflow>0){ $arr[] = array('name'=>'鐢宠浜...','fields'=>'uid'); $arr[] = array('name'=>'鎻愪氦浜...','fields'=>'optid'); } return $arr; } public function loaddata($id, $ispd=true) { $this->id = (int)$id; $this->mwhere = "`table`='$this->mtable' and `mid`='$id'"; $swhere = "`id`='$id'"; $wherestr = $this->moders['where']; if(!isempt($wherestr)){ $wherestr = $this->rock->covexec($wherestr); $swhere .= ' and '.$wherestr; } $this->rs = $this->getone($swhere); $this->uname = ''; if(!$this->rs)$this->echomsg('鏁版嵁璁板綍涓嶅瓨鍦ㄤ簡'); $this->rs['base_name'] = ''; $this->rs['base_deptname'] = ''; if(isset($this->rs['uid']))$this->uid = $this->rs['uid']; if(isset($this->rs['comid']))$this->companyid = $this->rs['comid']; if(!isset($this->rs['applydt']))$this->rs['applydt'] = ''; if(!isset($this->rs['status']))$this->rs['status'] = 1; $uisfield = property_exists($this, 'uidfields') ? $this->uidfields : 'optid'; if($this->uid==0 && isset($this->rs[$uisfield]))$this->uid = $this->rs[$uisfield]; $this->optid = isset($this->rs['optid']) ? $this->rs['optid'] : $this->uid; $this->urs = $this->adminmodel->getone($this->uid,'id,name,user,deptid,deptids,deptname,deptallname,face,ranking,superid,superpath,superman,deptpath'); if($this->isempt($this->rs['applydt'])&&isset($this->rs['optdt']))$this->rs['applydt']=substr($this->rs['optdt'],0,10); if($this->urs){ $this->drs = $this->db->getone('[Q]dept',"`id`='".$this->urs['deptid']."'"); $this->uname = $this->urs['name']; $this->rs['base_name'] = $this->uname; if($this->drs){ $this->rs['base_deptname'] = $this->drs['name']; } } $this->sericnum = ''; $this->billrs = $this->billmodel->getone($this->mwhere); if($this->billrs){ $this->sericnum = $this->billrs['sericnum']; if(isempt(arrvalue($this->billrs,'uname'))){ $this->savebill(); } if($this->billrs['status']!=$this->rs['status'])$this->billmodel->update('`status`='.$this->rs['status'].'', $this->billrs['id']); if($this->billrs['isturn']!=$this->rs['isturn'])$this->billmodel->update('`isturn`='.$this->rs['isturn'].'', $this->billrs['id']); if(isempt($this->rs['base_name']))$this->rs['base_name'] = $this->billrs['uname']; if(isempt($this->rs['base_deptname']))$this->rs['base_deptname'] = $this->billrs['udeptname']; }else{ if($this->isflow>0)$this->savebill(); } if($this->isflow>0){ if($this->rs['status']==1 && $this->rs['isturn']=='0'){ $this->update(array('isturn' => 1), $this->id); $this->rs['isturn'] = 1; if($this->billrs)$this->billmodel->update('`isturn`=1', $this->billrs['id']); } } $this->getlogrows = array(); if($ispd)$this->isreadqx(); $this->rssust = $this->rs; $this->flowchangedata(); $this->rs['base_systitle'] = TITLE; $this->rs['base_modename'] = $this->modename; $this->rs['base_sericnum'] = $this->sericnum; $this->rs['base_summary'] = $this->getsummary(); } public function getdaiban() { $s = $this->rock->dbinstr('nowcheckid', $this->adminid); $to = $this->billmodel->rows('`modeid`='.$this->modeid.' and `isdel`=0 and `status` not in(1,2) and '.$s.''); return $to; } public function isreadqx($glx=0) { $bo = false; if($this->adminid==1)$bo=true; if($this->uid==$this->adminid && $this->adminid>0)$bo=true; if(!$bo && $this->isflow>0){ if($this->billrs){ $allcheckid = $this->billrs['allcheckid']; if(contain(','.$allcheckid.',',','.$this->adminid.','))$bo = true; } } if(!$bo){ if($this->urs && contain($this->urs['superpath'],'['.$this->adminid.']'))$bo = true; } if(!$bo){ $tos = $this->todosmodel->rows("".$this->mwhere." and `uid`='$this->adminid'"); if($tos>0)$bo=true; } if(!$bo){ $tos = $this->chaomodel->rows($this->mwhere.' and '.$this->rock->dbinstr('csnameid', $this->adminid).''); if($tos>0)$bo=true; } if(!$bo){ $tos = $this->db->rows('[Q]todo', "`uid`='$this->adminid' and ".$this->mwhere.""); if($tos>0)$bo=true; } if(!$bo)$bo = $this->flowisreadqx(); if(!$bo){ $bo = $this->isreadqxs(); } if(!$bo){ $tos = $this->isjiankongqx(); if($tos>0)$bo=true; } if($glx==1)return $bo; if(!$bo)$this->echomsg('鏃犳潈闄愭煡鐪嬫ā鍧梉'.$this->modenum.'.'.$this->modename.']'.$this->uname.'鐨勬暟鎹紝璇疯仈绯荤鐞嗗憳鍒癧娴佺▼妯″潡鈫掓祦绋嬫ā鍧楁潈闄怾涓嬭缃'); } public function isreadqxs() { $bo = false; $where = $this->viewmodel->viewwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=true; return $bo; } public function iseditqx() { $bo = 0; if($bo==0 && $this->isflow>0){ if($this->billrs && ($this->uid == $this->adminid || $this->optid==$this->adminid)){ if($this->billrs['nstatus']==0 || $this->billrs['nstatus']==2){ $bo = 1; } } if($this->rs['status']==1)$bo=0; } if($bo==0){ $where = $this->viewmodel->editwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } return $bo; } public function isdeleteqx() { $bo = 0; if($bo==0 && $this->isflow>0){ if($this->billrs && ($this->uid == $this->adminid || $this->optid==$this->adminid)){ if($this->billrs['nstatus']==0 || $this->billrs['nstatus']==2){ $bo = 1; } } if($this->rs['status']==1)$bo=0; } if($bo==0){ $where = $this->viewmodel->deletewhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } $isd = $this->flowisdeleteqx(); if(is_numeric($isd) && $isd <= 1)$bo = $isd; return $bo; } public function isjiankongqx() { $bo = 0; if($bo==0){ $where = $this->viewmodel->jiankongwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } return $bo; } public function getfields($lx=0) { $fields = array(); if(!$this->fieldsarra)$this->tfieldsarra(); $farr = $this->fieldsarra; foreach($farr as $k=>$rs)if($rs['iszs']=='1')$fields[$rs['fields']] = $rs['name']; $fters = $this->flowgetfields($lx); if(is_array($fters))$fields = array_merge($fields, $fters); return $fields; } public function getinputurl($num='',$mid=0,$can=array()) { if($num=='')$num = $this->modenum; $xa = 'lu'; if($this->ismobile==1)$xa = 'lum'; $url = 'index.php?a='.$xa.'&m=input&d=flow&num='.$num.'&mid='.$mid.''; if(is_array($can)){ foreach($can as $k=>$v)$url.='&'.$k.'='.$v.''; }else{ $url .= '&'.$can.''; } return $url; } public function replacepbr(&$arr, $k) { $val = arrvalue($arr, $k); if(!c('html')->ishtml($val))$arr[$k] = str_replace("\n",'
', $val); return $arr; } public function getdatalog($lx=0, $isdy=0) { m('log')->addread($this->mtable, $this->id); $this->todosmodel->biaoyidu($this->adminid, $this->modenum, $this->id); $fobj = m('file'); $this->ismobile = $lx; $arr['modename'] = $this->modename; $arr['title'] = $this->modename; $arr['modeid'] = $this->modeid; $arr['modenum'] = $this->modenum; $arr['mid'] = $this->id; $arr['status'] = arrvalue($this->rs,'status'); $arr['logarr'] = $this->getlog(1); $arr['isplview'] = arrvalue($this->moders,'ispl','0'); $arr['isys'] = arrvalue($this->moders,'isys','0'); $contview = ''; $lsds = ($isdy==2) ? $isdy: $lx; $path = ''.P.'/flow/page/view_'.$this->modenum.'_'.$lsds.'.html'; if(COMPANYNUM){ $path1 = ''.P.'/flow/page/view_'.$this->modenum.'_'.COMPANYNUM.'_'.$lsds.'.html'; if(file_exists($path1))$path = $path1; } $fstr = $fobj->getstr($this->mtable, $this->id, 3); $issubtabs = 0; if($fstr != ''){ $this->rs['file_content'] = $fstr; } $data = $this->flowrsreplace($this->rs, ($isdy==2) ? 3 : 1); $dataa = $this->viewjinfields(array($data)); $data = $dataa[0]; $subdata = $this->getsuballdata(1); if($subdata){ $zbzd = m('flow_element')->getrows("`mid`='$this->modeid' and `iszb`>0 and `iszs`=1 and `fieldstype` in('uploadimg','uploadfile','textarea')",'`name`,`fields`,`fieldstype`,`iszb`','`iszb`,`sort`'); foreach($subdata as $zb=>$da){ $sub = $da['fields']; $data[$sub] = $this->getsubdata($zb,$da['data'],arrvalue($data,'subdatays'.$zb.'',$lx)); $data[''.$sub.'_style'] = 'padding:0'; } } $farrobj = $chufarr= array(); if(method_exists($this, 'flowxiangfields'))$chufarr = $this->flowxiangfields($chufarr); $farrobj['base_sericnum'] = array('name'=>arrvalue($chufarr,'base_sericnum','鍗曞彿')); $farrobj['base_name'] = array('name'=>arrvalue($chufarr,'base_name','鐢宠浜')); $farrobj['base_deptname'] = array('name'=>arrvalue($chufarr,'base_deptname','鐢宠浜洪儴闂')); $farrobj['base_status'] = array('name'=>arrvalue($chufarr,'base_status','娴佺▼鐘舵')); $farrobj['file_content'] = array('name'=>arrvalue($chufarr,'file_content','鐩稿叧鏂囦欢')); foreach($this->fieldsarra as $k=>$rs){ $fid = $rs['fields']; $fty = $rs['fieldstype']; if($fty=='uploadfile'){ $fval = arrvalue($data, $fid); if(isempt($fval))$fval='0'; $data[$fid] = ''; if($fval!='0'){ $data[$fid] = $fobj->getstr('', '', 3, "`id` in($fval)"); } } if($fty=='uploadimg' || $fty=='graph'){ $fval = arrvalue($data, $fid); if(!isempt($fval) && substr($fval,0,4)!='rock->gethttppath($fval); $fwei = ($fty=='graph') ? 50 : 100; $data[$fid] = ''; } } if($fty=='textarea'){ $this->replacepbr($data, $fid); } if($fty=='ditumap' && !isempt($rs['data'])){ $wzhi = arrvalue($data, $rs['data']); if(!isempt($wzhi))$data[$fid].='[鏌ョ湅鍦板浘]'; } $farrobj[$fid] = $rs; } $_logarr = $qfields = array(); foreach($arr['logarr'] as $k1=>$rs1)$_logarr[$rs1['id']] = $rs1; $logrows = $this->flogmodel->getrows($this->mwhere.' and `modeid`='.$this->modeid.' and `courseid`>0 and `courseid`<88888 and `status`>0 and `valid`=1'); foreach($logrows as $k2=>$rs2){ $rs3 = $_logarr[$rs2['id']]; $_coid = $rs2['courseid']; if(!isempt($rs3['qmimg']))$rs3['name'] = ''; $key1 = 'course'.$_coid.''; if(!isset($data[''.$key1.'_name'])){ $data[''.$key1.'_name'] = $rs3['name']; $data[''.$key1.'_zt'] = ''.$rs3['statusname'].''; $data[''.$key1.'_sm'] = $rs3['sm']; $data[''.$key1.'_dt'] = $rs3['checkdt']; }else{ $data[''.$key1.'_name'] .= ','.$rs3['name']; $data[''.$key1.'_sm'] .= ','.$rs3['sm']; $data[''.$key1.'_dt'] = $rs3['checkdt']; } $key2 = ''.$key1.'_all'; if(!isset($data[$key2])){ $qfields[$key2] = $rs2['name']; $data[$key2]=''; } $str1 = $rs3['name'].' '.$rs3['statusname'].' '.$rs3['checkdt'].''; if(!isempt($rs3['sm']))$str1.='锛'.$rs3['sm'].''; if($data[$key2]!='')$data[$key2].='
'; $data[$key2].= $str1; } $ztass = $this->getnowstatus(); $data['base_status'] = $ztass[3]; if(file_exists($path)){ $contview = $this->flowviewtpl(file_get_contents($path), $lx); preg_match_all('/\^(.*?)\^/', $contview, $list); foreach($list[1] as $k=>$nrs){ $fzdrs = arrvalue($farrobj, $nrs); if($fzdrs)$contview = str_replace('^'.$nrs.'^', $fzdrs['name'], $contview); } $contview = $this->rock->reparr($contview, $data); } $arr['isdefaultview'] = 0; foreach($chufarr as $f1=>$v1)$qfields[$f1] = $v1; if($this->isempt($contview) || contain($contview, '$contview$')){ $arr['isdefaultview'] = 1; $_fields = array(); if($this->isflow>0){ $_fields['base_sericnum'] = $farrobj['base_sericnum']['name']; $_fields['base_name'] = $farrobj['base_name']['name']; $_fields['base_deptname'] = $farrobj['base_deptname']['name']; $_fields['base_status'] = $farrobj['base_status']['name']; } $fields = array_merge($_fields, $this->getfields($lx)); if($fstr!='')$fields['file_content'] = $farrobj['file_content']['name']; foreach($subdata as $zb=>$da){ $fields[$da['fields']] = $da['name']; } if($qfields)$fields = array_merge($fields,$qfields); if($lx==0)foreach($fields as $k=>$rs){$data[''.$k.'_style'] = 'width:75%';break;} $_colsr = $this->xiangbordercolor; if($_colsr=='')$_colsr = getconfig('bcolorxiang'); $contvimr = c('html')->xiangtable($fields, $data, $_colsr); $contvimr = '
'.$contvimr.'
'; if($lx==1){ $contvimr = ''; if($this->isflow>0){ $contvimr.='
+ class flowModel extends Model { public $modenum; public $editcont= ''; public $id = 0; public $moders; public $modeid; public $modename; public $sericnum; public $billrs = array(); public $rs = array(); public $urs = array(); public $drs = array(); public $fieldsarr = array(); public $fieldsarra = array(); public $mwhere; public $mtable; public $uname; public $uid = 0; public $optid = 0; public $isflow = 0; public $ismobile= 0; public $minwidth= 100; public $inputwidth= 0; public $atype = ''; public $daochubo= false; public $companyid= 1; protected function flowinit(){} protected function flowchangedata(){} protected function flowchangetodo(){} protected function flowdeletebill($sm){} protected function flowzuofeibill($sm){} protected function flowsubmit($na, $sm){} protected function flowaddlog($arr){} protected function flowdatalog($arr){} protected function flowcheckbefore(){} protected function flowcheckafter($zt, $sm){} protected function flowcheckfinsh($zt){} protected function flowgetfields($lx){} protected function flowgetoptmenu($opt){} protected function flowcheckname($num){} protected function flowcoursejudge($num){} protected function flowoptmenu($ors, $crs){} protected function flowisreadqx(){return false;} protected function flowisdeleteqx(){return false;} protected function flowprintrows($r){return $r;} protected function flowsubdata($r, $lx=0){return $r;} protected function flownexttodo($type){return false;} protected function flowbillwhere($lx, $uid){return '';} protected $flowweixinarr = array(); protected $flowviewufieds = 'uid'; protected $flowcompanyidfieds = 'comid'; protected $flowfieldstype = 0; public function flowrsreplace($rs){return $rs;} public function flowrsreplace_we($row, $rs){return $row;} public function flowwesearchdata($lx){return array();} protected function flowrsreplaceedit($rs){return $rs;} protected $flowstatusarr = array(1); protected $subsubdatastyle = ''; protected $wherejoin = array(); public $defaultorder = ''; public $floweditother = false; public $xiangbordercolor = ''; public function echomsg($msg) { if(!isajax())exit($msg); showreturn('', $msg, 201); exit(); } public function flowfieldarr($farr, $lx){return $farr;} public function flowinputtpl($cont, $lx){return $cont;} public function flowviewtpl($cont, $lx){return $cont;} public function floweditoffice($frs, $ofrs){} public function initdata($num, $id=null) { if(is_array($num)){ $this->moders= $num; }else{ $this->moders = m('flow_set')->getone(is_numeric($num) ? $num : "`num`='$num'"); if(!$this->moders)$this->echomsg('妯″潡['.$num.']涓嶅瓨鍦紝璇峰埌[娴佺▼妯″潡鍒楄〃]涓嬫坊鍔'); } $this->daochubo = ($this->rock->post('execldown')=='true') ? true :false; $table = $this->moders['table']; $this->modeid = $this->moders['id']; $this->modenum = $this->moders['num']; $this->modename = $this->moders['name']; $this->isflow = (int)$this->moders['isflow']; $this->settable($table); $this->mtable = $table; $this->viewmodel = m('view'); $this->chaomodel = m('flow_chao'); $this->billmodel = m('flow_bill'); $this->todomodel = m('flow_todo'); $this->todosmodel = m('flowtodo'); $this->flogmodel = m('flow_log'); $this->checksmodel = m('flow_checks'); $this->cnamemodel = m('flowcname'); $this->wheremodel = m('where'); $this->adminmodel = m('admin'); $this->remindmodel = m('remind'); $this->option = m('option'); $this->companyid = $this->adminmodel->getcompanyid(); $this->tfieldsarra(); $this->mwhere = "`table`='$this->mtable' and `mid`=-1"; if(!$this->defaultorder){ $sortdir = arrvalue($this->moders, 'sortdir'); if(!isempt($sortdir))$this->defaultorder = str_replace(' ',',', $sortdir); } $this->flowinit(); if($id==null)return $this; $this->loaddata($id, true); return $this; } private function tfieldsarra() { $rows = m('flow_element')->getrows("`mid`='$this->modeid' and `iszb`=0",'`name`,`fields`,`isbt`,`iszs`,`fieldstype`,`savewhere`,`data`,`isdr`,`iszb`,`issou`,`islu`,`islb`,`isonly`,`attr`','`sort`'); $this->fieldsarr = array(); if($rows)foreach($rows as $k=>$rs){ if($rs['islu']==1)$this->fieldsarr[] = $rs; } $this->fieldsarra = $rows; } public function inputtitle() { return $this->moders['name']; } public function flowsearchfields() { $arr = array(); if($this->isflow>0){ $arr[] = array('name'=>'鐢宠浜...','fields'=>'uid'); $arr[] = array('name'=>'鎻愪氦浜...','fields'=>'optid'); } return $arr; } public function loaddata($id, $ispd=true) { $this->id = (int)$id; $this->mwhere = "`table`='$this->mtable' and `mid`='$id'"; $swhere = "`id`='$id'"; $wherestr = $this->moders['where']; if(!isempt($wherestr)){ $wherestr = $this->rock->covexec($wherestr); $swhere .= ' and '.$wherestr; } $this->rs = $this->getone($swhere); $this->uname = ''; if(!$this->rs)$this->echomsg('鏁版嵁璁板綍涓嶅瓨鍦ㄤ簡'); $this->rs['base_name'] = ''; $this->rs['base_deptname'] = ''; if(isset($this->rs['uid']))$this->uid = $this->rs['uid']; if(isset($this->rs['comid']))$this->companyid = $this->rs['comid']; if(!isset($this->rs['applydt']))$this->rs['applydt'] = ''; if(!isset($this->rs['status']))$this->rs['status'] = 1; $uisfield = property_exists($this, 'uidfields') ? $this->uidfields : 'optid'; if($this->uid==0 && isset($this->rs[$uisfield]))$this->uid = $this->rs[$uisfield]; $this->optid = isset($this->rs['optid']) ? $this->rs['optid'] : $this->uid; $this->urs = $this->adminmodel->getone($this->uid,'id,name,user,deptid,deptids,deptname,deptallname,face,ranking,superid,superpath,superman,deptpath'); if($this->isempt($this->rs['applydt'])&&isset($this->rs['optdt']))$this->rs['applydt']=substr($this->rs['optdt'],0,10); if($this->urs){ $this->drs = $this->db->getone('[Q]dept',"`id`='".$this->urs['deptid']."'"); $this->uname = $this->urs['name']; $this->rs['base_name'] = $this->uname; if($this->drs){ $this->rs['base_deptname'] = $this->drs['name']; } } $this->sericnum = ''; $this->billrs = $this->billmodel->getone($this->mwhere); if($this->billrs){ $this->sericnum = $this->billrs['sericnum']; if(isempt(arrvalue($this->billrs,'uname'))){ $this->savebill(); } if($this->billrs['status']!=$this->rs['status'])$this->billmodel->update('`status`='.$this->rs['status'].'', $this->billrs['id']); if($this->billrs['isturn']!=$this->rs['isturn'])$this->billmodel->update('`isturn`='.$this->rs['isturn'].'', $this->billrs['id']); if(isempt($this->rs['base_name']))$this->rs['base_name'] = $this->billrs['uname']; if(isempt($this->rs['base_deptname']))$this->rs['base_deptname'] = $this->billrs['udeptname']; }else{ if($this->isflow>0)$this->savebill(); } if($this->isflow>0){ if($this->rs['status']==1 && $this->rs['isturn']=='0'){ $this->update(array('isturn' => 1), $this->id); $this->rs['isturn'] = 1; if($this->billrs)$this->billmodel->update('`isturn`=1', $this->billrs['id']); } } $this->getlogrows = array(); if($ispd)$this->isreadqx(); $this->rssust = $this->rs; $this->flowchangedata(); $this->rs['base_systitle'] = TITLE; $this->rs['base_modename'] = $this->modename; $this->rs['base_sericnum'] = $this->sericnum; $this->rs['base_summary'] = $this->getsummary(); } public function getdaiban() { $s = $this->rock->dbinstr('nowcheckid', $this->adminid); $to = $this->billmodel->rows('`modeid`='.$this->modeid.' and `isdel`=0 and `status` not in(1,2) and '.$s.''); return $to; } public function isreadqx($glx=0) { $bo = false; if($this->adminid==1)$bo=true; if($this->uid==$this->adminid && $this->adminid>0)$bo=true; if(!$bo && $this->isflow>0){ if($this->billrs){ $allcheckid = $this->billrs['allcheckid']; if(contain(','.$allcheckid.',',','.$this->adminid.','))$bo = true; } } if(!$bo){ if($this->urs && contain($this->urs['superpath'],'['.$this->adminid.']'))$bo = true; } if(!$bo){ $tos = $this->todosmodel->rows("".$this->mwhere." and `uid`='$this->adminid'"); if($tos>0)$bo=true; } if(!$bo){ $tos = $this->chaomodel->rows($this->mwhere.' and '.$this->rock->dbinstr('csnameid', $this->adminid).''); if($tos>0)$bo=true; } if(!$bo){ $tos = $this->db->rows('[Q]todo', "`uid`='$this->adminid' and ".$this->mwhere.""); if($tos>0)$bo=true; } if(!$bo)$bo = $this->flowisreadqx(); if(!$bo){ $bo = $this->isreadqxs(); } if(!$bo){ $tos = $this->isjiankongqx(); if($tos>0)$bo=true; } if($glx==1)return $bo; if(!$bo)$this->echomsg('鏃犳潈闄愭煡鐪嬫ā鍧梉'.$this->modenum.'.'.$this->modename.']'.$this->uname.'鐨勬暟鎹紝璇疯仈绯荤鐞嗗憳鍒癧娴佺▼妯″潡鈫掓祦绋嬫ā鍧楁潈闄怾涓嬭缃'); } public function isreadqxs() { $bo = false; $where = $this->viewmodel->viewwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=true; return $bo; } public function iseditqx() { $bo = 0; if($bo==0 && $this->isflow>0){ if($this->billrs && ($this->uid == $this->adminid || $this->optid==$this->adminid)){ if($this->billrs['nstatus']==0 || $this->billrs['nstatus']==2){ $bo = 1; } } if($this->rs['status']==1)$bo=0; } if($bo==0){ $where = $this->viewmodel->editwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } return $bo; } public function isdeleteqx() { $bo = 0; if($bo==0 && $this->isflow>0){ if($this->billrs && ($this->uid == $this->adminid || $this->optid==$this->adminid)){ if($this->billrs['nstatus']==0 || $this->billrs['nstatus']==2){ $bo = 1; } } if($this->rs['status']==1)$bo=0; } if($bo==0){ $where = $this->viewmodel->deletewhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } $isd = $this->flowisdeleteqx(); if(is_numeric($isd) && $isd <= 1)$bo = $isd; return $bo; } public function isjiankongqx() { $bo = 0; if($bo==0){ $where = $this->viewmodel->jiankongwhere($this->moders, $this->adminid, $this->flowviewufieds); $where = str_replace('{asqom}','', $where); $tos = $this->rows("`id`='$this->id' $where "); if($tos>0)$bo=1; } return $bo; } public function getfields($lx=0) { $fields = array(); if(!$this->fieldsarra)$this->tfieldsarra(); $farr = $this->fieldsarra; foreach($farr as $k=>$rs)if($rs['iszs']=='1')$fields[$rs['fields']] = $rs['name']; $fters = $this->flowgetfields($lx); if(is_array($fters))$fields = array_merge($fields, $fters); return $fields; } public function getinputurl($num='',$mid=0,$can=array()) { if($num=='')$num = $this->modenum; $xa = 'lu'; if($this->ismobile==1)$xa = 'lum'; $url = 'index.php?a='.$xa.'&m=input&d=flow&num='.$num.'&mid='.$mid.''; if(is_array($can)){ foreach($can as $k=>$v)$url.='&'.$k.'='.$v.''; }else{ $url .= '&'.$can.''; } return $url; } public function replacepbr(&$arr, $k) { $val = arrvalue($arr, $k); if(!c('html')->ishtml($val))$arr[$k] = str_replace("\n",'
', $val); return $arr; } public function getdatalog($lx=0, $isdy=0) { m('log')->addread($this->mtable, $this->id); $this->todosmodel->biaoyidu($this->adminid, $this->modenum, $this->id); $fobj = m('file'); $this->ismobile = $lx; $arr['modename'] = $this->modename; $arr['title'] = $this->modename; $arr['modeid'] = $this->modeid; $arr['modenum'] = $this->modenum; $arr['mid'] = $this->id; $arr['status'] = arrvalue($this->rs,'status'); $arr['logarr'] = $this->getlog(1); $arr['isplview'] = arrvalue($this->moders,'ispl','0'); $arr['isys'] = arrvalue($this->moders,'isys','0'); $contview = ''; $lsds = ($isdy==2) ? $isdy: $lx; $path = ''.P.'/flow/page/view_'.$this->modenum.'_'.$lsds.'.html'; if(COMPANYNUM){ $path1 = ''.P.'/flow/page/view_'.$this->modenum.'_'.COMPANYNUM.'_'.$lsds.'.html'; if(file_exists($path1))$path = $path1; } $fstr = $fobj->getstr($this->mtable, $this->id, 3); $issubtabs = 0; if($fstr != ''){ $this->rs['file_content'] = $fstr; } $data = $this->flowrsreplace($this->rs, ($isdy==2) ? 3 : 1); $dataa = $this->viewjinfields(array($data)); $data = $dataa[0]; $subdata = $this->getsuballdata(1); if($subdata){ $zbzd = m('flow_element')->getrows("`mid`='$this->modeid' and `iszb`>0 and `iszs`=1 and `fieldstype` in('uploadimg','uploadfile','textarea')",'`name`,`fields`,`fieldstype`,`iszb`','`iszb`,`sort`'); foreach($subdata as $zb=>$da){ $sub = $da['fields']; $data[$sub] = $this->getsubdata($zb,$da['data'],arrvalue($data,'subdatays'.$zb.'',$lx)); $data[''.$sub.'_style'] = 'padding:0'; } } $farrobj = $chufarr= array(); if(method_exists($this, 'flowxiangfields'))$chufarr = $this->flowxiangfields($chufarr); $farrobj['base_sericnum'] = array('name'=>arrvalue($chufarr,'base_sericnum','鍗曞彿')); $farrobj['base_name'] = array('name'=>arrvalue($chufarr,'base_name','鐢宠浜')); $farrobj['base_deptname'] = array('name'=>arrvalue($chufarr,'base_deptname','鐢宠浜洪儴闂')); $farrobj['base_status'] = array('name'=>arrvalue($chufarr,'base_status','娴佺▼鐘舵')); $farrobj['file_content'] = array('name'=>arrvalue($chufarr,'file_content','鐩稿叧鏂囦欢')); foreach($this->fieldsarra as $k=>$rs){ $fid = $rs['fields']; $fty = $rs['fieldstype']; if($fty=='uploadfile'){ $fval = arrvalue($data, $fid); if(isempt($fval))$fval='0'; $data[$fid] = ''; if($fval!='0'){ $data[$fid] = $fobj->getstr('', '', 3, "`id` in($fval)"); } } if($fty=='uploadimg' || $fty=='graph'){ $fval = arrvalue($data, $fid); if(!isempt($fval) && substr($fval,0,4)!='rock->gethttppath($fval); $fwei = ($fty=='graph') ? 50 : 100; $data[$fid] = ''; } } if($fty=='textarea'){ $this->replacepbr($data, $fid); } if($fty=='ditumap' && !isempt($rs['data'])){ $wzhi = arrvalue($data, $rs['data']); if(!isempt($wzhi))$data[$fid].='[鏌ョ湅鍦板浘]'; } $farrobj[$fid] = $rs; } $_logarr = $qfields = array(); foreach($arr['logarr'] as $k1=>$rs1)$_logarr[$rs1['id']] = $rs1; $logrows = $this->flogmodel->getrows($this->mwhere.' and `modeid`='.$this->modeid.' and `courseid`>0 and `courseid`<88888 and `status`>0 and `valid`=1','*','id desc'); $togdar = array(); foreach($logrows as $k2=>$rs2){ $sie1 = $rs2['courseid'].'_'.$rs2['checkid']; if(isset($togdar[$sie1])){ $logrows[$k2]['show'] = false; }else{ $togdar[$sie1] = true; $logrows[$k2]['show'] = true; } } foreach($logrows as $k2=>$rs2){ if(!$rs2['show'])continue; $rs3 = $_logarr[$rs2['id']]; $_coid = $rs2['courseid']; if(!isempt($rs3['qmimg']))$rs3['name'] = ''; $key1 = 'course'.$_coid.''; if(!isset($data[''.$key1.'_name'])){ $data[''.$key1.'_name'] = $rs3['name']; $data[''.$key1.'_zt'] = ''.$rs3['statusname'].''; $data[''.$key1.'_sm'] = $rs3['sm']; $data[''.$key1.'_dt'] = $rs3['checkdt']; }else{ $data[''.$key1.'_name'] .= ','.$rs3['name']; $data[''.$key1.'_sm'] .= ','.$rs3['sm']; $data[''.$key1.'_dt'] = $rs3['checkdt']; } $key2 = ''.$key1.'_all'; if(!isset($data[$key2])){ $qfields[$key2] = $rs2['name']; $data[$key2]=''; } $str1 = $rs3['name'].' '.$rs3['statusname'].' '.$rs3['checkdt'].''; if(!isempt($rs3['sm']))$str1.='锛'.$rs3['sm'].''; if($data[$key2]!='')$data[$key2].='
'; $data[$key2].= $str1; } $ztass = $this->getnowstatus(); $data['base_status'] = $ztass[3]; if(file_exists($path)){ $contview = $this->flowviewtpl(file_get_contents($path), $lx); preg_match_all('/\^(.*?)\^/', $contview, $list); foreach($list[1] as $k=>$nrs){ $fzdrs = arrvalue($farrobj, $nrs); if($fzdrs)$contview = str_replace('^'.$nrs.'^', $fzdrs['name'], $contview); } $contview = $this->rock->reparr($contview, $data); } $arr['isdefaultview'] = 0; foreach($chufarr as $f1=>$v1)$qfields[$f1] = $v1; if($this->isempt($contview) || contain($contview, '$contview$')){ $arr['isdefaultview'] = 1; $_fields = array(); if($this->isflow>0){ $_fields['base_sericnum'] = $farrobj['base_sericnum']['name']; $_fields['base_name'] = $farrobj['base_name']['name']; $_fields['base_deptname'] = $farrobj['base_deptname']['name']; $_fields['base_status'] = $farrobj['base_status']['name']; } $fields = array_merge($_fields, $this->getfields($lx)); if($fstr!='')$fields['file_content'] = $farrobj['file_content']['name']; foreach($subdata as $zb=>$da){ $fields[$da['fields']] = $da['name']; } if($qfields)$fields = array_merge($fields,$qfields); if($lx==0)foreach($fields as $k=>$rs){$data[''.$k.'_style'] = 'width:75%';break;} $_colsr = $this->xiangbordercolor; if($_colsr=='')$_colsr = getconfig('bcolorxiang'); $contvimr = c('html')->xiangtable($fields, $data, $_colsr); $contvimr = '
'.$contvimr.'
'; if($lx==1){ $contvimr = ''; if($this->isflow>0){ $contvimr.='
diff --git a/webmain/model/hrModel.php b/webmain/model/hrModel.php index 90152d0..9d6ceb7 100644 --- a/webmain/model/hrModel.php +++ b/webmain/model/hrModel.php @@ -43,7 +43,8 @@ class hrClassModel extends Model 'quitdt' => $rs['quitdt'] ), $rs['uid']); m('admin')->update(array( - 'quitdt' => $rs['quitdt'] + 'quitdt' => $rs['quitdt'], + 'status' => '0' ), $rs['uid']); if($bo)$db->update("`isover`=1", $rs['id']); } diff --git a/webmain/model/kaoqinModel.php b/webmain/model/kaoqinModel.php index 7311e37..d82d611 100644 --- a/webmain/model/kaoqinModel.php +++ b/webmain/model/kaoqinModel.php @@ -798,13 +798,15 @@ class kaoqinClassModel extends Model /** * 鍒ゆ柇杩欐鏃堕棿鏄惁鍙互鐢宠璇峰亣 */ - public function leavepan($uid, $qjkind, $start, $end, $totals, $id=0) + public function leavepan($uid, $qjkind, $start, $end, $totals, $id=0, $kind='') { $msg = ''; - $sdf = $this->db->rows('[Q]kqinfo',"`uid`='$uid' and `status`<>5 and ((`stime`<='$start' and `etime`>='$start') or (`stime`<='$end' and `etime`>='$end') or (`stime`>='$start' and `etime`<='$end')) and `kind`='璇峰亣' and `id`<>'$id' "); + if($kind=='')$kind = '璇峰亣'; + $sdf = $this->db->rows('[Q]kqinfo',"`uid`='$uid' and `status`<>5 and ((`stime`<='$start' and `etime`>='$start') or (`stime`<='$end' and `etime`>='$end') or (`stime`>='$start' and `etime`<='$end')) and `kind`='$kind' and `id`<>'$id' "); if($sdf > 0){ $msg = '璇ユ椂闂存宸茬敵璇疯繃浜'; } + if($kind=='鍔犵彮')return $msg; $tsjia = '浜嬪亣,鐥呭亣'; $tsjia = m('option')->getval('kqsqtype', $tsjia); //璇诲彇閫夐」 if($msg == '' && !$this->contain(','.$tsjia.',', ','.$qjkind.',')){ diff --git a/webmain/model/modeModel.php b/webmain/model/modeModel.php index cf44317..23316d0 100644 --- a/webmain/model/modeModel.php +++ b/webmain/model/modeModel.php @@ -322,6 +322,7 @@ $rstr = "".$hstart." $arr['collectm'] = '414,415,416'; $arr['eduxueqi'] = '419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435'; $arr['yqhealthy'] = '436,437'; + $arr['wyxiaoqu'] = '438,439,440,441,442,443,444,445,446,447,448,449,450,451'; return $arr; } diff --git a/webmain/system/admin/adminAction.php b/webmain/system/admin/adminAction.php index 1bcdf43..1d8fa31 100644 --- a/webmain/system/admin/adminAction.php +++ b/webmain/system/admin/adminAction.php @@ -103,6 +103,7 @@ class adminClassAction extends Action public function updatedataAjax() { + c('cache')->del('deptuserjson'); $a = $this->updatess(); m('imgroup')->updategall(); echo '鎬'.$a[0].'鏉¤褰,鏇存柊浜'.$a[1].'鏉'; diff --git a/webmain/system/cog/cogAction.php b/webmain/system/cog/cogAction.php index 6949e39..2bbaffd 100644 --- a/webmain/system/cog/cogAction.php +++ b/webmain/system/cog/cogAction.php @@ -367,7 +367,7 @@ return array( if(getconfig('systype')=='demo')return '婕旂ず涓嶈鏀'; $stype = (int)$this->post('stype','0'); $msg = 'ok'; - if($stype==0)$msg = $this->saveconfig('title,imgcompress,watertype,video_bool,flowchehuitime,saasmode,hoemtimeout',',video_bool,'); + if($stype==0)$msg = $this->saveconfig('title,imgcompress,watertype,video_bool,flowchehuitime,saasmode,hoemtimeout,usercache',',video_bool,'); return $msg; } diff --git a/webmain/system/cog/rock_cog_moreset.php b/webmain/system/cog/rock_cog_moreset.php index f168d6e..7579a3f 100644 --- a/webmain/system/cog/rock_cog_moreset.php +++ b/webmain/system/cog/rock_cog_moreset.php @@ -45,7 +45,7 @@ $(document).ready(function(){ } this.xuannum = []; var xues = ',gong,vcard,remind,tovoid,'; - var less = ',鍏枃,杩涢攢瀛,瀹㈡埛,宸ョ▼,鑰冨嫟,鐗╁搧,杞﹁締,瀛︽牎,'; + var less = ',鍏枃,杩涢攢瀛,瀹㈡埛,宸ョ▼,鑰冨嫟,鐗╁搧,杞﹁締,瀛︽牎,鐗╀笟,'; var d,i1,i2=0,i3=0,dis='',bh='',zs=0; for(i in typarr){ @@ -165,6 +165,9 @@ $(document).ready(function(){ 鍗曚綅鍒嗛挓锛岄粯璁ゆ槸0娌℃湁闄愬埗 + + +
璇诲彇浜哄憳缂撳瓨鏂瑰紡锛
  diff --git a/webmain/system/dept/deptAction.php b/webmain/system/dept/deptAction.php index 63ce19b..5122d1d 100644 --- a/webmain/system/dept/deptAction.php +++ b/webmain/system/dept/deptAction.php @@ -128,7 +128,7 @@ class deptClassAction extends Action $bo = $this->contain($val, $ars['did']); } $ars['checked']=$bo; - } + } } $rows[] = $ars; } @@ -137,7 +137,14 @@ class deptClassAction extends Action public function deptuserjsonAjax() { - $udarr = m('dept')->getdeptuserdata(1); + $udarr = m('dept')->getdeptuserdata(1); + $bool = false; + if(!ISMORECOM && !$udarr['uarr'] && $udarr['isall']){ + $udarrs = c('cache')->get('deptuserjson'); + if($udarrs)$udarr = $udarrs; + $bool = true; + } + $userarr = $udarr['uarr']; $deptarr = $udarr['darr']; $grouparr = $udarr['garr']; @@ -145,6 +152,8 @@ class deptClassAction extends Action $arr['deptjson'] = json_encode($deptarr); $arr['userjson'] = json_encode($userarr); $arr['groupjson'] = json_encode($grouparr); + $arr['iscache'] = getconfig('usercache'); + if(!ISMORECOM && $udarr['isall'] && !$bool)c('cache')->set('deptuserjson', $udarr); $this->showreturn($arr); } } \ No newline at end of file diff --git a/webmain/system/dept/tpl_dept.html b/webmain/system/dept/tpl_dept.html index 3a6e879..46db26b 100644 --- a/webmain/system/dept/tpl_dept.html +++ b/webmain/system/dept/tpl_dept.html @@ -55,15 +55,21 @@ var c = { $('#showtype').css('height',''+he+'px'); }, loaddata:function(iscs){ - var url = js.getajaxurl('deptuserjson','dept','system',{'changerange':this.changerange}); + var url = js.getajaxurl('deptuserjson','dept','system',{'changerange':this.changerange,'gtype':'change'}); $('#showdiv_0').html('
') $.get(url,function(ret){ var d = js.decode(ret); ret = d.data; if(c.changerange==''){ - js.setoption('deptjson', ret.deptjson); - js.setoption('userjson', ret.userjson); - js.setoption('groupjson', ret.groupjson); + if(ret.iscache=='1'){ + js.setoption('deptjson', ''); + js.setoption('userjson', ''); + js.setoption('groupjson', ''); + }else{ + js.setoption('deptjson', ret.deptjson); + js.setoption('userjson', ret.userjson); + js.setoption('groupjson', ret.groupjson); + } } c.userarr = js.decode(ret.userjson); diff --git a/webmain/system/sysfile/sysfileAction.php b/webmain/system/sysfile/sysfileAction.php index 6ee4fb1..4460886 100644 --- a/webmain/system/sysfile/sysfileAction.php +++ b/webmain/system/sysfile/sysfileAction.php @@ -95,7 +95,8 @@ class sysfileClassAction extends Action if($str=$this->iscaozuo())return $str; $path = $this->jm->base64decode($this->get('path')); if(isempt($path))return '鏃犳晥璺緞'; - if(!file_exists($path))return '鏂囦欢涓嶅瓨鍦'; + + if(!file_exists(ROOT_PATH.'/'.$path))return '鏂囦欢涓嶅瓨鍦'; $pathinfo=pathinfo($path); $filename = $pathinfo['basename']; diff --git a/webmain/task/api/uploadAction.php b/webmain/task/api/uploadAction.php index 5e5c5ca..0531fb1 100644 --- a/webmain/task/api/uploadAction.php +++ b/webmain/task/api/uploadAction.php @@ -523,4 +523,59 @@ class uploadClassAction extends apiAction return returnsuccess($uarr); } + + /** + * 鏂囧簱閫夋嫨鏂囦欢 + */ + public function changedataAction() + { + $rows = array(); + $uptp = $this->get('uptp'); + $tsye = $this->get('tsye'); + $key = $this->get('key'); + $selv = (int)$this->get('selvalue','0'); + $where = '`optid`='.$this->adminid.''; + if($selv==1){ + $str = m('admin')->getjoinstrs('`shateid`', $this->adminid, 1); + $where = '`id` in(select `fileid` from `[Q]word` where `type`=0 '.$str.' )'; + } + if($key){ + $key = $this->jm->base64decode($key); + $where.=" and `filename` like '%".$key."%'"; + } + if($uptp && $uptp!='*'){ + if($uptp=='image')$uptp='jpg,png,gif,jpeg'; + $uptp = str_replace(',', "','", $uptp); + $where.=" and `fileext` in('".$uptp."')"; + } + $db = m('file'); + $rows = $db->getall($where,'id,filename,filesizecn,fileext,thumbpath,filepath,filepathout','`id` desc limit 10'); + foreach($rows as $k=>$rs){ + $rows[$k]['value'] = $rs['id']; + $rows[$k]['name'] = $rs['filename']; + $rows[$k]['subname']= $rs['filesizecn']; + $rows[$k]['xuanbool']= true; + if($tsye=='img'){ + if(!isempt($rs['filepathout']))$rows[$k]['filepath'] = $rs['filepathout']; + }else{ + unset($rows[$k]['filepath']); + } + unset($rows[$k]['filepathout']); + if(!isempt($rs['thumbpath'])){ + $rows[$k]['iconsimg'] = $rs['thumbpath']; + }else{ + $flx = $rs['fileext']; + if(!contain($db->fileall,','.$flx.','))$flx='wz'; + $rows[$k]['iconsimg'] = 'web/images/fileicons/'.$flx.'.gif'; + } + } + $count = $db->rows($where); + $selectdata[] = array('value'=>'','name'=>'閫夎嚜宸变笂浼'); + $selectdata[] = array('value'=>'1','name'=>'鍏变韩缁欐垜鐨'); + return array( + 'rows' => $rows, + 'totalCount' => $count, + 'selectdata' => $selectdata + ); + } } \ No newline at end of file diff --git a/webmain/task/runt/hrAction.php b/webmain/task/runt/hrAction.php index bedcaa0..e87275b 100644 --- a/webmain/task/runt/hrAction.php +++ b/webmain/task/runt/hrAction.php @@ -42,72 +42,5 @@ class hrClassAction extends runtAction return 'success'; } - - - - - - - - - //杞鐨 - private function updatepositive($timess) - { - $db = m('hrpositive'); - $rows = $db->getall("`status`=1 and `isover`=0",'`id`,`uid`,`entrydt`,`syenddt`,`positivedt`'); - foreach($rows as $k=>$rs){ - if(strtotime($rs['positivedt']) <= $timess){ - $bo = m('userinfo')->update(array( - 'state' => '1', - 'syenddt' => $rs['syenddt'], - 'positivedt' => $rs['positivedt'], - ), $rs['uid']); - if($bo)$db->update("`isover`=1", $rs['id']); - } - } - } - - //绂昏亴鐨 - private function updatehrredund($timess) - { - $db = m('hrredund'); - $rows = $db->getall("`status`=1 and `isover`=0",'`id`,`uid`,`quitdt`'); - $timess = $timess - 24*3600;//鏄ㄥぉ - foreach($rows as $k=>$rs){ - if(strtotime($rs['quitdt']) <= $timess){ - $bo = m('userinfo')->update(array( - 'state' => '5', - 'quitdt' => $rs['quitdt'] - ), $rs['uid']); - m('admin')->update(array( - 'quitdt' => $rs['quitdt'] - ), $rs['uid']); - if($bo)$db->update("`isover`=1", $rs['id']); - } - } - } - - //璋冨姩鐨 - private function updatehrtransfer($timess) - { - $db = m('hrtransfer'); - $mdb = m('admin'); - $rows = $db->getall("`status`=1 and `isover`=0",'`id`,`uid`,`effectivedt`,`newdeptid`,`tranuid`,`newdeptname`,`newranking`'); - $uids = '0'; - foreach($rows as $k=>$rs){ - if(strtotime($rs['effectivedt']) <= $timess){ - $uid = $rs['tranuid']; - $bo = $mdb->update(array( - 'deptid' => $rs['newdeptid'], - 'deptname' => $rs['newdeptname'], - 'ranking' => $rs['newranking'], - ), $uid); - if($bo){ - $db->update("`isover`=1", $rs['id']); - $uids.=','.$uid; - } - } - } - if($uids != '0')$mdb->updateinfo("and `id` in($uids)"); - } + } \ No newline at end of file