Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -90,13 +90,13 @@ class CustomModuleExtentController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/12/21 9:25
      * @time   :2023/12/21 9:25
      */
      */
-    public function extendContent(CustomModuleExtentContent $content){
+    public function extendContent(CustomModuleExtend $extend){
         $this->request->validate([
         $this->request->validate([
             'module_id'=>['required'],
             'module_id'=>['required'],
         ],[
         ],[
             'module_id.required' => 'module_id不能为空',
             'module_id.required' => 'module_id不能为空',
         ]);
         ]);
-        $lists = $content->list($this->map);
+        $lists = $extend->list($this->map,'created_at');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -382,8 +382,8 @@ class ProjectLogic extends BaseLogic
      */
      */
     public function createUser($mobile,$project_id,$lead_name){
     public function createUser($mobile,$project_id,$lead_name){
         $userModel = new UserModel();
         $userModel = new UserModel();
-        //查看当前用户是否存在
-        $info = $userModel->read(['mobile'=>$mobile,'project_id'=>$project_id]);
+        //查看当前项目是否存在超级管理员
+        $info = $userModel->read(['role_id'=>0,'project_id'=>$project_id]);
         if($info === false){
         if($info === false){
             $data = [
             $data = [
                 'mobile'=>$mobile,
                 'mobile'=>$mobile,
@@ -395,6 +395,8 @@ class ProjectLogic extends BaseLogic
                 'create_id'=>$this->manager['id'] ?? 0,
                 'create_id'=>$this->manager['id'] ?? 0,
             ];
             ];
             $userModel->add($data);
             $userModel->add($data);
+        }else{
+            $userModel->edit(['mobile'=>$mobile,'name'=>$lead_name],['id'=>$info['id']]);
         }
         }
         return $this->success();
         return $this->success();
     }
     }

@@ -104,7 +104,6 @@ class UserLogic extends BaseLogic
         if($param['role_id'] == $this->model::ROLE_MANAGER){
         if($param['role_id'] == $this->model::ROLE_MANAGER){
             if(isset($param['id']) && !empty($param['id'])){
             if(isset($param['id']) && !empty($param['id'])){
                 $condition = [
                 $condition = [
-                    'mobile' => $param['mobile'],
                     'project_id'=>$param['project_id'],
                     'project_id'=>$param['project_id'],
                     'id' => ['!=', $param['id']],
                     'id' => ['!=', $param['id']],
                     'role_id'=>$this->model::ROLE_MANAGER
                     'role_id'=>$this->model::ROLE_MANAGER
@@ -157,7 +156,11 @@ class UserLogic extends BaseLogic
                 }
                 }
                 Common::del_user_cache($this->model, $id, 'A');
                 Common::del_user_cache($this->model, $id, 'A');
             }else{
             }else{
-                $this->fail('超级管理员不允许删除');
+                //查看当前项目是否有其他的超级管理员
+                $roleInfo = $this->model->read(['id'=>['!=',$info['id']],'role_id'=>0]);
+                if($roleInfo === false){
+                    $this->fail('超级管理员不允许删除');
+                }
             }
             }
         }
         }
         return $this->success();
         return $this->success();

@@ -281,6 +281,7 @@ class CustomModuleContentLogic extends BaseLogic
         }
         }
         $v['project_id'] = $this->user['project_id'];
         $v['project_id'] = $this->user['project_id'];
         $v['content_id'] = $content_id;
         $v['content_id'] = $content_id;
+        $v['module_id'] = $content_id;
         return $this->success($v);
         return $this->success($v);
     }
     }
 
 

@@ -25,6 +25,7 @@ class BlogRequest extends FormRequest
     {
     {
         return [
         return [
             'name'=>'required|max:100',
             'name'=>'required|max:100',
+            'remark'=>'max:255',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -33,7 +34,9 @@ class BlogRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
-            'url.required'=>'链接不能为空'
+            'name.max'=>'名称超过最长长度',
+            'url.required'=>'链接不能为空',
+            'remark.max'=>'描述超过最长长度'
         ];
         ];
     }
     }
 }
 }

@@ -24,7 +24,8 @@ class NewsRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'name'=>'required|max:200',
+            'name'=>'required|max:100',
+            'remark'=>'max:255',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -33,8 +34,9 @@ class NewsRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
-            'name.max'=>'名称最大200字',
-            'url.required'=>'新闻链接不能为空'
+            'name.max'=>'名称超过最长长度',
+            'url.required'=>'链接不能为空',
+            'remark.max'=>'描述超过最长长度'
         ];
         ];
     }
     }
 }
 }