From 96b72cbc332ed6e3115136bf9fac951590e04c06 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 6 Sep 2021 19:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=A9=E6=95=88=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketPercentageController.class.php      | 30 ++++++++++++-------
 .../View/MarketPercentage/coefficient.html    | 28 +++++++++--------
 .../MarketPercentage/marketstaffsettle.html   |  2 +-
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index d22c1a7ae..97953dcdd 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -519,16 +519,16 @@ class MarketPercentageController extends ThinkController
             unset($_GET['is_get']);
             $data = $_GET;
 
-            $if_coefficientSave = M("market_altogether", "tab_")
-                ->where([
-                    'pay_time' => $pay_time,
-                    'market_check' => 1
-                ])
-                ->find();
+            // $if_coefficientSave = M("market_altogether", "tab_")
+            //     ->where([
+            //         'pay_time' => $pay_time,
+            //         'market_check' => 1
+            //     ])
+            //     ->find();
 
-            if ($if_coefficientSave) {
-                $this->ajaxReturn(['status' => 0, 'msg' => "市场部已确认，绩效系数再不可修改"]);
-            }
+            // if ($if_coefficientSave) {
+            //     $this->ajaxReturn(['status' => 0, 'msg' => "市场部已确认，绩效系数再不可修改"]);
+            // }
 
             $admin = $_SESSION['onethink_admin']['user_auth']['username'];
             $coefficient_check_detail = "已审批（{$admin}）<br>" . date("Y-m-d H:i:s", time());
@@ -583,9 +583,19 @@ class MarketPercentageController extends ThinkController
 
 
         } else {
+            $uids = M("market_altogether", "tab_")
+                ->where([
+                    'pay_time' => $pay_time,
+                    'market_check' => 0
+                ])
+                ->getField('admin_id',true);
+            if($uids){
+                $uids = implode(",",$uids);
+                $map['_string'] = "sys_auth_group_access.uid in ({$uids})";
+            }
+
             $map['sys_auth_group_access.uid'] =['in',$this->MarketEvent->getAdminidByLeaderid()];
             $map['auth.id'] =['in',$this->MarketEvent->getNoLeaderMarketGroupId()];
-
             $data = M("auth_group_access")
                 ->field("sys_member.nickname,sys_member.real_name,sys_member.uid,sys_auth_group_access.group_id,IF(coefficient is not NULL, coefficient, 100) coefficient,sys_ucenter_member.leave_time")
                 ->join("left join sys_auth_group auth on auth.id = sys_auth_group_access.group_id")
diff --git a/Application/Admin/View/MarketPercentage/coefficient.html b/Application/Admin/View/MarketPercentage/coefficient.html
index a48112313..b5724407a 100644
--- a/Application/Admin/View/MarketPercentage/coefficient.html
+++ b/Application/Admin/View/MarketPercentage/coefficient.html
@@ -103,20 +103,24 @@
                     <tbody id="statementShow">
                     <if condition = "empty($list_data)">
                         <tr>
-                            <td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
+                            <td colspan="16" class="text-center">aOh! 暂时无需要确认的绩效!</td>
                         </tr>
-                    </if>
+                        </tbody>
+                    </table>
+                    <else />
                         <volist name="list_data" id="data">
-                            <tr <if condition = "$data.is_hide eq 1"> style="display:none;" </if>>
-                                <td >{$data['real_name']}</td>
-                                <td ><input style="width: auto;" name="{$data['nickname']}-{$data['uid']}-{$data['real_name']}" value="{$data['coefficient']/100}"></td>
-                            </tr>
-                        </volist>
-                    </tbody>
-                </table>
-                <div class="jssearch fr cf search_list" style="width: 100%;">
-                    <a class="sch-btn" id="confimBtn" url="{:U('coefficientSave')}" style="width: 120px;margin-top: 20px;margin-right: 20px;float: right;">提交保存</a>
-                </div>
+                                <tr <if condition = "$data.is_hide eq 1"> style="display:none;" </if>>
+                                    <td >{$data['real_name']}</td>
+                                    <td ><input style="width: auto;" name="{$data['nickname']}-{$data['uid']}-{$data['real_name']}" value="{$data['coefficient']/100}"></td>
+                                </tr>
+                            </volist>
+                        </tbody>
+                        </table>
+                        <div class="jssearch fr cf search_list" style="width: 100%;">
+                            <a class="sch-btn" id="confimBtn" url="{:U('coefficientSave')}" style="width: 120px;margin-top: 20px;margin-right: 20px;float: right;">提交保存</a>
+                        </div>
+                    </if>
+                        
             </form>
         </div>
     </div>
diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
index 89efdf748..1a85b6c31 100644
--- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html
+++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
@@ -227,7 +227,7 @@
                     <tbody>
                     <if condition = "empty($list_data)">
                         <tr>
-                            <td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
+                            <td colspan="16" class="text-center">aOh! 暂时无需要确认数据。</td>
                         </tr>
                     </if>
                     <notemtpy name = "list_data">