1

.idea/workspace.xml

@@ -3,8 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/service/CheckPower.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/CheckPower.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recruit.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -199,7 +202,7 @@
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
       <workItem from="1670287594399" duration="11535000" />
-      <workItem from="1670461023846" duration="13498000" />
+      <workItem from="1670461023846" duration="15290000" />
     </task>
     <servers />
   </component>
@@ -269,10 +272,10 @@
     </option>
   </component>
   <component name="WindowStateProjectService">
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1670477355612">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1670478230769">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670477355612" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670478230769" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1670291222413">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -298,10 +301,10 @@
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670461034563" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670466534922">
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670478737584">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670466534922" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670478737584" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Datum.php

@@ -528,6 +528,9 @@ class Datum extends Base
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
+        foreach ($list as &$v) {
+            $v['is_normal'] = CheckPower::checkModulesPower($v['datum_id'],$v['url_id'],$this->request->controller());
+        }
         $this->success('ok',['list'=>$list]);
     }
 

application/api/controller/Mall.php

@@ -9,6 +9,7 @@ use app\common\model\UserCollect;
 use app\common\model\UserSearch;
 use app\common\model\UserTrack;
 use app\common\service\Activity;
+use app\common\service\CheckPower;
 use library\tools\Data;
 use think\Db;
 
@@ -260,6 +261,7 @@ class Mall extends Base
         $sel_where[]  = ['t.type','=',6];
         $title = input('get.name');
         if($title)  $sel_where[]  = ['i.name','like','%'.$title.'%'];
+        var_dump($sel_where);
         $list = UserTrack::where($sel_where)
             ->alias('t')
             ->field('t.id,t.update_int,t.date,t.first_id goods_id,i.name,i.cover,i.low_price')
@@ -269,6 +271,7 @@ class Mall extends Base
             ->select()->toArray();
         foreach ($list as &$v) {
             $v['time'] = date("Y-m-d H:i:s",$v['update_int']);
+            $v['is_normal'] = CheckPower::checkModulesPower($v['goods_id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }
@@ -303,6 +306,9 @@ class Mall extends Base
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
+        array_walk($list,function (&$v){
+            $v['is_normal'] = CheckPower::checkModulesPower($v['goods_id'],0,$this->request->controller());
+        });
         $this->success('ok',['list'=>$list]);
     }
 
@@ -329,6 +335,9 @@ class Mall extends Base
             ->order(['sort'=>'desc','id'=>'desc'])
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
+        array_walk($list,function (&$v){
+            $v['is_normal'] = CheckPower::checkModulesPower($v['id'],0,$this->request->controller());
+        });
         $this->success('ok',['list'=>$list]);
     }
 

application/api/controller/Press.php

@@ -8,6 +8,7 @@ use app\common\model\UserMessage;
 use app\common\model\UserReport;
 use app\common\model\UserSearch;
 use app\common\model\UserTrack;
+use app\common\service\CheckPower;
 use library\tools\Data;
 /**
  * @title 新闻
@@ -448,7 +449,7 @@ class Press extends Base
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = PressComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.cover,i.images')
+            ->field('t.id,t.create_at,t.first_id press_id,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.cover,i.images')
             ->leftJoin('store_member u','t.user_id = u.id')
             ->leftJoin('Press i','t.first_id = i.id')
             ->order('t.id desc')
@@ -457,6 +458,7 @@ class Press extends Base
         foreach ($list as &$v) {
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
             $parent_comment = PressComment::where([['t.id','=',$v['pid']]])
                 ->field('t.id,t.first_id press_id,t.content,i.title,i.cover,t.pid,u.name')
                 ->alias('t')
@@ -502,6 +504,9 @@ class Press extends Base
             ->order('t.id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
+        array_walk($list,function (&$v){
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
+        });
         $this->success('ok',['list'=>$list]);
     }
 
@@ -542,6 +547,7 @@ class Press extends Base
         foreach ($list as &$v) {
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
 
@@ -592,6 +598,7 @@ class Press extends Base
             $v['headimg'] = $user_info['headimg'];
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
             $parent_comment = PressComment::where([['t.id','=',$v['pid']]])
                 ->field('t.id,t.first_id press_id,t.content,i.title,i.cover,i.images,t.pid,u.name')
                 ->alias('t')
@@ -639,6 +646,7 @@ class Press extends Base
         foreach ($list as &$v) {
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
            /* $v['comment_num'] = PressComment::where(['first_id'=>$v['press_id'],'type'=>1,'is_deleted'=>0])->count();
             $v['collect_num'] = UserCollect::getCollectNum(4,$v['press_id']);
             $v['praise_num'] = PlatformLike::getPraiseNum($v['press_id'],1);*/
@@ -684,6 +692,7 @@ class Press extends Base
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v) {
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
             $v['comment_num'] = PressComment::where(['first_id'=>$v['press_id'],'type'=>1,'is_deleted'=>0])->count();
             $v['is_collect'] = UserCollect::checkCollectByType($this->user_id,4,$v['press_id']);
             $v['collect_num'] = UserCollect::getCollectNum(4,$v['press_id']);
@@ -727,6 +736,7 @@ class Press extends Base
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v) {
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
             $v['time'] = date("Y-m-d H:i:s",$v['update_int']);

application/api/controller/Recruit.php

@@ -6,6 +6,7 @@ use app\common\model\User;
 use app\common\model\UserCollect;
 use app\common\model\UserSearch;
 use app\common\model\UserTrack;
+use app\common\service\CheckPower;
 use library\tools\Data;
 use think\Db;
 
@@ -395,8 +396,9 @@ class Recruit extends Base
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v) {
-                $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
+            $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
             $v['welfare_arr'] = explode(',',trim($v['welfare'],','));
+            $v['is_normal'] = CheckPower::checkModulesPower($v['id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }
@@ -449,8 +451,9 @@ class Recruit extends Base
         $app_logo = sysconf('app_logo');
         foreach ($list as &$v) {
             $v['time'] = date("Y-m-d H:i:s",$v['update_int']);
-                $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
+            $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
             $v['welfare_arr'] = explode(',',trim($v['welfare'],','));
+            $v['is_normal'] = CheckPower::checkModulesPower($v['recruit_id'],0,$this->request->controller());
             if(!$v['user_id']){
                 $v['app_name']  = $app_name;
                 $v['app_logo']  = $app_logo;
@@ -512,6 +515,7 @@ class Recruit extends Base
         foreach ($list as &$v) {
             $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
             $v['welfare_arr'] = explode(',',trim($v['welfare'],','));
+            $v['is_normal'] = CheckPower::checkModulesPower($v['recruit_id'],0,$this->request->controller());
             if(!$v['user_id']){
                 $v['app_name']  = $app_name;
                 $v['app_logo']  = $app_logo;

application/api/controller/Supplier.php

@@ -7,6 +7,7 @@ use app\common\model\UserCollect;
 use app\common\model\UserSearch;
 use app\common\model\SupplierGoods;
 use app\common\model\UserTrack;
+use app\common\service\CheckPower;
 use library\tools\Data;
 use think\Db;
 
@@ -538,6 +539,7 @@ class Supplier extends Base
             $v['cover_arr'] = $v['cover']? explode('|',$v['cover']) : null;
             $v['label_name'] = $v['label']? explode(',',trim($v['label'],',')) : null;
             $v['supplier_name'] = \app\common\model\Supplier::where('id',$v['supplier_id'])->value('title');
+            $v['is_normal'] = CheckPower::checkModulesPower($v['goods_id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }
@@ -579,6 +581,7 @@ class Supplier extends Base
             $v['cover_arr'] = explode('|',$v['cover']);
             $v['label_name'] = explode(',',$v['label']);
             $v['supplier_name'] = \app\common\model\Supplier::where('id',$v['supplier_id'])->value('title');
+            $v['is_normal'] = CheckPower::checkModulesPower($v['goods_id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }
@@ -622,6 +625,7 @@ class Supplier extends Base
             $v['cover_arr'] = explode('|',$v['cover']);
             $v['label_name'] = explode(',',$v['label']);
             $v['supplier_name'] = \app\common\model\Supplier::where('id',$v['supplier_id'])->value('title');
+            $v['is_normal'] = CheckPower::checkModulesPower($v['goods_id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }