fix:前台获取客户代码块接口限制为只查私有库、新增不可对指定私有代码块类目重复上传公共库机制

app/api/controller/CodeCustomer/CodeModule.php

@@ -44,6 +44,7 @@ class CodeModule extends BaseController
             ['code_module_audit', '='],
             ['a.customer_guid', '=', 'customer_guid'],
         );
+        $con[] = ['a.code_module_library_type', '=', ModelCodeModuleCategory::LIBRARY_PRIVATE];
 
         $query = ModelCodeModule::where($con)
             ->alias('a')

app/api/logic/Code/CodeModuleCategory.php

@@ -34,6 +34,7 @@ class CodeModuleCategory
                 'code_module_category_library_type' => ModelCodeModuleCategory::LIBRARY_COMMON,
                 'code_module_category_audit' => ModelCodeModuleCategory::AUDIT_UNAUDITED,
                 'customer_guid' => $model_category->customer_guid,
+                'common_original_category_guid' => $model_category->code_module_category_guid,
             ]);
         };
         //匿名函数-新增代码块(用于拷贝送审代码块时的值修改及其新增操作)
@@ -51,6 +52,8 @@ class CodeModuleCategory
         };
         //主级类目验证
         $category = self::validateMasterCodeModuleCategory($code_module_category_guid, true);
+        //公共类目重复上传验证
+        self::validateCommonCategoryRepeatUpload($code_module_category_guid);
         //主级类目拷贝送审
         $master_category_add = $addCategory($category);
         CustomerMessageAuditCodeModuleCategory::unaudited($master_category_add->code_module_category_guid);
@@ -69,6 +72,27 @@ class CodeModuleCategory
 
     }
 
+    /**
+     * 公共类目重复上传验证
+     * 
+     * @param string $code_module_category_guid 类目guid
+     * @return void
+     * @date 2023-09-01
+     * @author xjh
+     * @since 1.0.0
+     */
+    public static function validateCommonCategoryRepeatUpload(string $code_module_category_guid): void
+    {
+        $is_category = ModelCodeModuleCategory::where([
+            ['code_module_category_library_type', '=', ModelCodeModuleCategory::LIBRARY_COMMON],
+            ['common_original_category_guid', '=', $code_module_category_guid],
+            ['code_module_category_audit', 'in', [ModelCodeModuleCategory::AUDIT_PASS, ModelCodeModuleCategory::AUDIT_UNAUDITED]],
+        ])->find();
+        if ($is_category) {
+            throwErrorMsg("该私有类目已上传过公共类目,请不要对其重复上传!");
+        }
+    }
+
     /**
      * 构建客户代码类目初始审核状态
      * 

app/common/model/Code/CodeModuleCategory.php

@@ -40,7 +40,7 @@ class CodeModuleCategory extends BaseModel
         'code_module_category_update_user_guid' => 'string',
         'code_module_category_delete_time' => 'datetime',
         'code_module_category_delete_user_guid' => 'string',
-
+        'common_original_category_guid' => 'string',
     ];
     // 设置json类型字段
     protected $json = [''];