diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 7a9796c2b..d576dbc0b 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1668,11 +1668,11 @@ function getPowerPromoteIds() if (in_array($userAuth['data_empower_type'], [2, 3])) { $promoteIds = ''; //自己创建的会长 - $myPromote_ids = M('promote', 'tab_') - ->field('GROUP_CONCAT(id) as promote_ids') + $promotes = M('promote', 'tab_') + ->field('id') ->where(['admin_id' => $userAuth['uid']]) - ->find(); - $myPromote_ids = $myPromote_ids['promote_ids']; + ->select(); + $myPromote_ids = implode(',', array_column($promotes, 'id')); if ($myPromote_ids) { if ($userAuth['data_empower_type'] == 2) {//部分会长加上自己创建的会长 @@ -1690,11 +1690,11 @@ function getPowerPromoteIds() $where['id'] = array('in', $userAuth['data_president']);//会长本身 $where['_logic'] = 'or'; $map['_complex'] = $where; - $sqlResult = M('promote', 'tab_') - ->field('GROUP_CONCAT(id) as promote_ids') + $promotes = M('promote', 'tab_') + ->field('id') ->where($map) - ->find(); - $promoteIds = $sqlResult['promote_ids']; + ->select(); + $promoteIds = implode(',', array_column($promotes, 'id')); } } } diff --git a/Application/Admin/View/PaymentMerchant/ruleAddForm.html b/Application/Admin/View/PaymentMerchant/ruleAddForm.html index 51097a15e..7b055411d 100644 --- a/Application/Admin/View/PaymentMerchant/ruleAddForm.html +++ b/Application/Admin/View/PaymentMerchant/ruleAddForm.html @@ -470,8 +470,8 @@ $(function(){ var notValue = getTodayValue() var startValue = parseInt(startTime.replace(/-/g, "")) var endValue = parseInt(endTime.replace(/-/g, "")) - if (notValue >= startValue) { - return layer.msg('开始生效时间必须在今天之后') + if (notValue > startValue) { + return layer.msg('开始生效时间至少从今天开始') } if (endTime != '') { var endValue = parseInt(endTime.replace(/-/g, ""))