权限标识相关功能修复

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java

@@ -1,6 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base;
 
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
@@ -32,7 +33,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/base/contact")
 @Validated
-public class ContactController {
+public class ContactController implements BusinessControllerMarker {
 
 
     @Resource
@@ -40,14 +41,14 @@ public class ContactController {
 
     @PostMapping("/create")
     @Operation(summary = "创建联系人信息")
-    @PreAuthorize("@ss.hasPermission('base:contact:create')")
+    //@PreAuthorize("@ss.hasPermission('basic:contact-config:create')")
     public CommonResult<ContactRespVO> createContact(@Valid @RequestBody ContactSaveReqVO createReqVO) {
         return success(contactService.createContact(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新联系人信息")
-    @PreAuthorize("@ss.hasPermission('base:contact:update')")
+    //@PreAuthorize("@ss.hasPermission('basic:contact-config:update')")
     public CommonResult<Boolean> updateContact(@Valid @RequestBody ContactSaveReqVO updateReqVO) {
         contactService.updateContact(updateReqVO);
         return success(true);
@@ -56,7 +57,7 @@ public class ContactController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除联系人信息")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:contact:delete')")
+    //@PreAuthorize("@ss.hasPermission('basic:contact-config:delete')")
     public CommonResult<Boolean> deleteContact(@RequestParam("id") Long id) {
         contactService.deleteContact(id);
         return success(true);
@@ -65,7 +66,7 @@ public class ContactController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除联系人信息")
-                @PreAuthorize("@ss.hasPermission('base:contact:delete')")
+    //@PreAuthorize("@ss.hasPermission('basic:contact-config:delete')")
     public CommonResult<Boolean> deleteContactList(@RequestBody BatchDeleteReqVO req) {
         contactService.deleteContactListByIds(req.getIds());
         return success(true);
@@ -103,7 +104,7 @@ public class ContactController {
 
     @PutMapping("/enable-list")
     @Operation(summary = "批量更新")
-    @PreAuthorize("@ss.hasPermission('base:contact:update')")
+    //@PreAuthorize("@ss.hasAnyPermissions({'base:contact:update','basic:contact-config:disable','basic:contact-config:enable'})")
     public CommonResult<Boolean> enableContactList(@RequestBody List<ContactSaveReqVO> saveReqVOS) {
         contactService.enableContactList(saveReqVOS);
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java

@@ -41,14 +41,14 @@ public class TaxController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建税码信息")
-    @PreAuthorize("@ss.hasPermission('base:tax:create')")
+    @PreAuthorize("@ss.hasPermission('basic:tax-config:create')")
     public CommonResult<TaxRespVO> createTax(@Valid @RequestBody TaxSaveReqVO createReqVO) {
         return success(taxService.createTax(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新税码信息")
-    @PreAuthorize("@ss.hasPermission('base:tax:update')")
+    @PreAuthorize("@ss.hasPermission('basic:tax-config:update')")
     public CommonResult<Boolean> updateTax(@Valid @RequestBody TaxSaveReqVO updateReqVO) {
         taxService.updateTax(updateReqVO);
         return success(true);
@@ -57,7 +57,7 @@ public class TaxController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除税码信息")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:tax:delete')")
+    @PreAuthorize("@ss.hasPermission('basic:tax-config:delete')")
     public CommonResult<Boolean> deleteTax(@RequestParam("id") Long id) {
         taxService.deleteTax(id);
         return success(true);
@@ -66,7 +66,7 @@ public class TaxController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除税码信息")
-                @PreAuthorize("@ss.hasPermission('base:tax:delete')")
+                @PreAuthorize("@ss.hasPermission('basic:tax-config:delete')")
     public CommonResult<Boolean> deleteTaxList(@RequestBody BatchDeleteReqVO req) {
         taxService.deleteTaxListByIds(req.getIds());
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/DepartmentInstanceRelativityController.java

@@ -56,14 +56,14 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @PostMapping("/create")
     @Operation(summary = "创建部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:create')")
+    //@PreAuthorize("@ss.hasPermission('base:department-instance-relativity:create')")
     public CommonResult<DepartmentInstanceRelativityRespVO> createDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO createReqVO) {
         return success(departmentInstanceRelativityService.createDepartmentInstanceRelativity(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:update')")
+    //@PreAuthorize("@ss.hasPermission('base:department-instance-relativity:update')")
     public CommonResult<Boolean> updateDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO updateReqVO) {
         departmentInstanceRelativityService.updateDepartmentInstanceRelativity(updateReqVO);
         return success(true);
@@ -72,7 +72,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete")
     @Operation(summary = "删除部门与实例关联")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativity(@RequestParam("id") String id) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativity(id);
         return success(true);
@@ -81,7 +81,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除部门与实例关联")
-                @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativityList(@RequestBody BatchDeleteReqVO req) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativityListByIds(req.getIds());
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java

@@ -70,14 +70,14 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板实例")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:create')")
     public CommonResult<TemplateInstanceRespVO> createTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO createReqVO) {
         return success(templateInstanceService.createTemplateInstance(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板实例")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> updateTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO updateReqVO) {
         templateInstanceService.updateTemplateInstance(updateReqVO);
         return success(true);
@@ -86,7 +86,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板实例")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstance(@RequestParam("id") Long id) {
         templateInstanceService.deleteTemplateInstance(id);
         return success(true);
@@ -95,7 +95,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板实例")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceList(@RequestBody BatchDeleteReqVO req) {
         templateInstanceService.deleteTemplateInstanceListByIds(req.getIds());
         return success(true);
@@ -133,7 +133,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出模板实例 Excel")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:export')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTemplateInstanceExcel(@Valid TemplateInstancePageReqVO pageReqVO,
                                             HttpServletResponse response) throws IOException {
@@ -147,7 +147,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //模版实例发布
     @PostMapping("/publish-batch")
     @Operation(summary = "模版实例发布")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> publishTemplateInstance(@Valid @RequestBody List<PublishTemplateInstanceReqVO> publishReqVOS) {
         templateInstanceService.publishTemplateInstance(publishReqVOS);
         return success(true);
@@ -156,7 +156,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //不显示停用状态的查询接口
     @GetMapping("/list-excluding-disabled")
     @Operation(summary = "获得模板实例")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<PageResult<TemplateInstanceRespVO>> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO) {
         PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(templateInstanceService.listExcludingDisabled(pageReqVO), TemplateInstanceRespVO.class);
         templateInstanceRespVOPageResult.getList().forEach(
@@ -172,7 +172,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //停用和启用接口
     @PostMapping("/disable-enable")
     @Operation(summary = "实例停用和启用接口", description = "实例停用和启用接口")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) {
         templateInstanceService.setDisableOrEnable(reqVO);
         return success(true);
@@ -189,7 +189,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //创建版本
     @PostMapping("/create-version")
     @Operation(summary = "创建版本")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance:create')")
     public CommonResult<TemplateInstanceRespVO> createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) {
         return success(templateInstanceService.createVersion(id));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceDataController.java

@@ -47,14 +47,14 @@ public class TemplateInstanceDataController implements BusinessControllerMarker
 
     @PostMapping("/create")
     @Operation(summary = "创建实例字段值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-data:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-data:create')")
     public CommonResult<TemplateInstanceDataRespVO> createTemplateInstanceData(@Valid @RequestBody TemplateInstanceDataSaveReqVO createReqVO) {
         return success(templateInstanceDataService.createTemplateInstanceData(createReqVO));
     }
 
     @PostMapping("/create-batch")
     @Operation(summary = "批量创建实例字段值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-data:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-data:create')")
     public CommonResult<List<TemplateInstanceDataRespVO>> createBatchTemplateInstanceData(@Valid @RequestBody List<TemplateInstanceDataSaveReqVO> createReqVOS) {
         return success(templateInstanceDataService.createBatchTemplateInstanceData(createReqVOS));
     }
@@ -62,7 +62,7 @@ public class TemplateInstanceDataController implements BusinessControllerMarker
 
     @PutMapping("/update")
     @Operation(summary = "更新实例字段值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-data:update')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-data:update')")
     public CommonResult<Boolean> updateTemplateInstanceData(@Valid @RequestBody TemplateInstanceDataSaveReqVO updateReqVO) {
         templateInstanceDataService.updateTemplateInstanceData(updateReqVO);
         return success(true);
@@ -71,7 +71,7 @@ public class TemplateInstanceDataController implements BusinessControllerMarker
     @DeleteMapping("/delete")
     @Operation(summary = "删除实例字段值")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:template-instance-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-data:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceData(@RequestParam("id") Long id) {
         templateInstanceDataService.deleteTemplateInstanceData(id);
         return success(true);
@@ -80,7 +80,7 @@ public class TemplateInstanceDataController implements BusinessControllerMarker
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除实例字段值")
-                @PreAuthorize("@ss.hasPermission('base:template-instance-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-data:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceDataList(@RequestBody BatchDeleteReqVO req) {
         templateInstanceDataService.deleteTemplateInstanceDataListByIds(req.getIds());
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceItemController.java

@@ -46,21 +46,21 @@ public class TemplateInstanceItemController implements BusinessControllerMarker
 
     @PostMapping("/create")
     @Operation(summary = "创建实例条款值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-item:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-item:create')")
     public CommonResult<TemplateInstanceItemRespVO> createTemplateInstanceItem(@Valid @RequestBody TemplateInstanceItemSaveReqVO createReqVO) {
         return success(templateInstanceItemService.createTemplateInstanceItem(createReqVO));
     }
 
     @PostMapping("/create-batch")
     @Operation(summary = "批量创建实例条款值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-item:create')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-item:create')")
     public CommonResult<List<TemplateInstanceItemRespVO>> createBatchTemplateInstanceItem(@Valid @RequestBody List<TemplateInstanceItemSaveReqVO> createReqVOS) {
         return success(templateInstanceItemService.createBatchTemplateInstanceItem(createReqVOS));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新实例条款值")
-    @PreAuthorize("@ss.hasPermission('base:template-instance-item:update')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-item:update')")
     public CommonResult<Boolean> updateTemplateInstanceItem(@Valid @RequestBody TemplateInstanceItemSaveReqVO updateReqVO) {
         templateInstanceItemService.updateTemplateInstanceItem(updateReqVO);
         return success(true);
@@ -69,7 +69,7 @@ public class TemplateInstanceItemController implements BusinessControllerMarker
     @DeleteMapping("/delete")
     @Operation(summary = "删除实例条款值")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:template-instance-item:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-item:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceItem(@RequestParam("id") String id) {
         templateInstanceItemService.deleteTemplateInstanceItem(id);
         return success(true);
@@ -78,7 +78,7 @@ public class TemplateInstanceItemController implements BusinessControllerMarker
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除实例条款值")
-                @PreAuthorize("@ss.hasPermission('base:template-instance-item:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:template-instance-item:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceItemList(@RequestBody BatchDeleteReqVO req) {
         List<String> ids = req.getIds().stream().map(String::valueOf).toList();
         templateInstanceItemService.deleteTemplateInstanceItemListByIds(ids);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java

@@ -49,14 +49,14 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板实例与业务中间")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:create')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:create')")
     public CommonResult<TmplInscBsnRelRespVO> createTmplInscBsnRel(@Valid @RequestBody TmplInscBsnRelSaveReqVO createReqVO) {
         return success(tmplInscBsnRelService.createTmplInscBsnRel(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板实例与业务中间")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:update')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:update')")
     public CommonResult<Boolean> updateTmplInscBsnRel(@Valid @RequestBody TmplInscBsnRelSaveReqVO updateReqVO) {
         tmplInscBsnRelService.updateTmplInscBsnRel(updateReqVO);
         return success(true);
@@ -65,7 +65,7 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板实例与业务中间")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:delete')")
     public CommonResult<Boolean> deleteTmplInscBsnRel(@RequestParam("id") Long id) {
         tmplInscBsnRelService.deleteTmplInscBsnRel(id);
         return success(true);
@@ -74,7 +74,7 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板实例与业务中间")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:delete')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:delete')")
     public CommonResult<Boolean> deleteTmplInscBsnRelList(@RequestBody BatchDeleteReqVO req) {
         tmplInscBsnRelService.deleteTmplInscBsnRelListByIds(req.getIds());
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscDatBsnController.java

@@ -46,14 +46,14 @@ public class TmplInscDatBsnController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建业务实例字段值")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:create')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:create')")
     public CommonResult<TmplInscDatBsnRespVO> createTmplInscDatBsn(@Valid @RequestBody TmplInscDatBsnSaveReqVO createReqVO) {
         return success(tmplInscDatBsnService.createTmplInscDatBsn(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新业务实例字段值")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:update')")
     public CommonResult<Boolean> updateTmplInscDatBsn(@Valid @RequestBody TmplInscDatBsnSaveReqVO updateReqVO) {
         tmplInscDatBsnService.updateTmplInscDatBsn(updateReqVO);
         return success(true);
@@ -62,7 +62,7 @@ public class TmplInscDatBsnController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除业务实例字段值")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:delete')")
     public CommonResult<Boolean> deleteTmplInscDatBsn(@RequestParam("id") String id) {
         tmplInscDatBsnService.deleteTmplInscDatBsn(id);
         return success(true);
@@ -71,7 +71,7 @@ public class TmplInscDatBsnController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除业务实例字段值")
-                @PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:delete')")
     public CommonResult<Boolean> deleteTmplInscDatBsnList(@RequestBody BatchDeleteReqVO req) {
         tmplInscDatBsnService.deleteTmplInscDatBsnListByIds(req.getIds().stream().map(String::valueOf).toList());
         return success(true);
@@ -98,7 +98,7 @@ public class TmplInscDatBsnController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出业务实例字段值 Excel")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:export')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-dat-bsn:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTmplInscDatBsnExcel(@Valid TmplInscDatBsnPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscItmBsnController.java

@@ -44,14 +44,14 @@ public class TmplInscItmBsnController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建业务实例条款值")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:create')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:create')")
     public CommonResult<TmplInscItmBsnRespVO> createTmplInscItmBsn(@Valid @RequestBody TmplInscItmBsnSaveReqVO createReqVO) {
         return success(tmplInscItmBsnService.createTmplInscItmBsn(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新业务实例条款值")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:update')")
     public CommonResult<Boolean> updateTmplInscItmBsn(@Valid @RequestBody TmplInscItmBsnSaveReqVO updateReqVO) {
         tmplInscItmBsnService.updateTmplInscItmBsn(updateReqVO);
         return success(true);
@@ -60,7 +60,7 @@ public class TmplInscItmBsnController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除业务实例条款值")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:delete')")
     public CommonResult<Boolean> deleteTmplInscItmBsn(@RequestParam("id") String id) {
         tmplInscItmBsnService.deleteTmplInscItmBsn(id);
         return success(true);
@@ -69,7 +69,7 @@ public class TmplInscItmBsnController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除业务实例条款值")
-                @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:delete')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:delete')")
     public CommonResult<Boolean> deleteTmplInscItmBsnList(@RequestBody BatchDeleteReqVO req) {
         tmplInscItmBsnService.deleteTmplInscItmBsnListByIds(req.getIds());
         return success(true);
@@ -94,7 +94,7 @@ public class TmplInscItmBsnController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出业务实例条款值 Excel")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:export')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-insc-itm-bsn:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTmplInscItmBsnExcel(@Valid TmplInscItmBsnPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java

@@ -37,7 +37,7 @@ public class TmplItmController {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板条款")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:create')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:create')")
     public CommonResult<TmplItmRespVO> createTmplItm(@Valid @RequestBody TmplItmSaveReqVO createReqVO) {
         TmplItmRespVO tmplItm = tmplItmService.createTmplItm(createReqVO);
         return success(tmplItm);
@@ -45,7 +45,7 @@ public class TmplItmController {
 
     @PutMapping("/update")
     @Operation(summary = "更新模板条款")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-ltm:update')")
     public CommonResult<Boolean> updateTmplItm(@Valid @RequestBody TmplItmSaveReqVO updateReqVO) {
         tmplItmService.updateTmplItm(updateReqVO);
         return success(true);
@@ -53,7 +53,7 @@ public class TmplItmController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板条款", description = "")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-ltm:delete')")
     public CommonResult<Boolean> deleteTmplItm(@RequestBody BatchDeleteReqVO req) {
         return success(tmplItmService.deleteTmplItm(req.getIds()));
     }
@@ -67,6 +67,7 @@ public class TmplItmController {
 
     @GetMapping("/list")
     @Operation(summary = "获得模板条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:query')")
     public CommonResult<List<TmplItmRespVO>> listTmplItm(Map<String, Object> params) {
         // 创建查询条件构造器
         QueryWrapper<TmplItmDO> queryWrapper = new QueryWrapper<>();
@@ -100,7 +101,7 @@ public class TmplItmController {
 
     @PutMapping("/update-sts")
     @Operation(summary = "更新模板条款状态")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
+    //@PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
     public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
         tmplItmService.updateTmplTpSts(updateStsVO);
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java

@@ -51,14 +51,14 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @PostMapping("/create")
     @Operation(summary = "创建模板分类")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:create')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:create')")
     public CommonResult<TmplTpRespVO> createTmplTp(@Valid @RequestBody TmplTpSaveReqVO createReqVO) {
         return success(tmplTpService.createTmplTp(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板分类")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> updateTmplTp(@Valid @RequestBody TmplTpSaveReqVO updateReqVO) {
         tmplTpService.updateTmplTp(updateReqVO);
         return success(true);
@@ -67,7 +67,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板分类")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
     public CommonResult<Boolean> deleteTmplTp(@RequestBody BatchDeleteReqVO req) {
         tmplTpService.deleteTmplTp(req.getIds());
         return success(true);
@@ -76,7 +76,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板分类")
-                @PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
     public CommonResult<Boolean> deleteTmplTpList(@RequestBody BatchDeleteReqVO req) {
         tmplTpService.deleteTmplTpListByIds(req.getIds());
         return success(true);
@@ -101,7 +101,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出模板分类 Excel")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:export')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTmplTpExcel(@Valid TmplTpPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -133,7 +133,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //更新类型状态
     @PutMapping("/updateStatus")
     @Operation(summary = "更新模板类型状态")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> updateStatus(@RequestBody Map<String,Object> params) {
         if (params == null){
             throw exception(PARAMS_IS_NULL_OR_ERR);
@@ -157,7 +157,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     // 字段编辑新增或者删除
     @PostMapping("/field-edit")
     @Operation(summary = "字段编辑新增或者删除")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> fieldEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
         tmplTpService.fieldEdit(reqVO);
         return success(true);
@@ -165,7 +165,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @PostMapping("/ltm-edit")
     @Operation(summary = "条款编辑新增或者删除")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> ltmEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
         tmplTpService.ltmEdit(reqVO);
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java

@@ -34,21 +34,21 @@ public class TmplTpFldController {
     private final TmplTpFldService tmplTpFldService;
     @PostMapping("/create")
     @Operation(summary = "创建模板字段")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
+    // @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
     public CommonResult<TmplFldRespVO> createTmplFld(@Valid @RequestBody TmplTpFldSaveReqVO tmplTpFldSaveReqVO) {
         return success(tmplTpFldService.createTmplFld(tmplTpFldSaveReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板字段")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
     public CommonResult<Boolean> updateTmplTp(@Valid @RequestBody TmplTpFldSaveReqVO updateReqVO) {
         tmplTpFldService.updateTmplFld(updateReqVO);
         return success(true);
     }
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板字段")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:delete')")
     public CommonResult<Boolean> deleteTmplTp(@RequestBody BatchDeleteReqVO req) {
         tmplTpFldService.deleteTmplTpByIds(req.getIds());
         return success(true);
@@ -68,7 +68,7 @@ public class TmplTpFldController {
     }
     @PutMapping("/update-sts")
     @Operation(summary = "更新模板字段状态")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
+    //@PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
     public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
         tmplTpFldService.updateTmplTpSts(updateStsVO);
         return success(true);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/internalsupplyfactory/InternalSupplyFactoryMapper.java

@@ -23,7 +23,7 @@ public interface InternalSupplyFactoryMapper extends BaseMapperX<InternalSupplyF
                 .likeIfPresent(InternalSupplyFactoryDO::getCompanyIdCustom, reqVO.getCompanyIdCustom())
                 .likeIfPresent(InternalSupplyFactoryDO::getCompanyNameCustom, reqVO.getCompanyNameCustom())
                 .likeIfPresent(InternalSupplyFactoryDO::getName, reqVO.getName())
-                .eqIfPresent(InternalSupplyFactoryDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(InternalSupplyFactoryDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(InternalSupplyFactoryDO::getType, reqVO.getType())
                 .likeIfPresent(InternalSupplyFactoryDO::getRelativityName, reqVO.getRelativityName())
                 .eqIfPresent(InternalSupplyFactoryDO::getRelativityNumber, reqVO.getRelativityNumber())

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java

@@ -63,41 +63,41 @@ public class ContactDO extends BusinessBaseDO {
      */
     @TableField("IS_ENB")
     private String isEnable;
-    /**
+//    /**
-    * 公司编号
+//    * 公司编号
-    */
+//    */
-    @TableField("COMPANY_ID")
+//    @TableField("COMPANY_ID")
-    private Long companyId;
+//    private Long companyId;
-    /**
+//    /**
-    * 公司名称
+//    * 公司名称
-    */
+//    */
-    @TableField("COMPANY_NAME")
+//    @TableField("COMPANY_NAME")
-    private String companyName;
+//    private String companyName;
-    /**
+//    /**
-    * 部门编号
+//    * 部门编号
-    */
+//    */
-    @TableField("DEPT_ID")
+//    @TableField("DEPT_ID")
-    private Long deptId;
+//    private Long deptId;
-    /**
+//    /**
-    * 部门名称
+//    * 部门名称
-    */
+//    */
-    @TableField("DEPT_NAME")
+//    @TableField("DEPT_NAME")
-    private String deptName;
+//    private String deptName;
-    /**
+//    /**
-    * 岗位编号
+//    * 岗位编号
-    */
+//    */
-    @TableField("POST_ID")
+//    @TableField("POST_ID")
-    private Long postId;
+//    private Long postId;
-    /**
+//    /**
-    * 创建人名称
+//    * 创建人名称
-    */
+//    */
-    @TableField("CREATOR_NAME")
+//    @TableField("CREATOR_NAME")
-    private String creatorName;
+//    private String creatorName;
-    /**
+//    /**
-    * 更新人名称
+//    * 更新人名称
-    */
+//    */
-    @TableField("UPDATER_NAME")
+//    @TableField("UPDATER_NAME")
-    private String updaterName;
+//    private String updaterName;
 
     @TableField("CSTM_NUM")
     private String customerNumber;