权限标识相关功能修复

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

@@ -40,14 +40,14 @@ public class AccountController {
 
     @PostMapping("/create")
     @Operation(summary = "创建账户条款")
-    @PreAuthorize("@ss.hasPermission('base:account:create')")
+   // @PreAuthorize("@ss.hasPermission('base:account:create')")
     public CommonResult<AccountRespVO> createAccount(@Valid @RequestBody AccountSaveReqVO createReqVO) {
         return success(accountService.createAccount(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新账户条款")
-    @PreAuthorize("@ss.hasPermission('base:account:update')")
+    //@PreAuthorize("@ss.hasPermission('base:account:update')")
     public CommonResult<Boolean> updateAccount(@Valid @RequestBody AccountSaveReqVO updateReqVO) {
         accountService.updateAccount(updateReqVO);
         return success(true);
@@ -56,7 +56,7 @@ public class AccountController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除账户条款")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:account:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:account:delete')")
     public CommonResult<Boolean> deleteAccount(@RequestParam("id") Long id) {
         accountService.deleteAccount(id);
         return success(true);
@@ -65,7 +65,7 @@ public class AccountController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除账户条款")
-                @PreAuthorize("@ss.hasPermission('base:account:delete')")
+    //@PreAuthorize("@ss.hasPermission('base:account:delete')")
     public CommonResult<Boolean> deleteAccountList(@RequestBody BatchDeleteReqVO req) {
         accountService.deleteAccountListByIds(req.getIds());
         return success(true);
@@ -103,7 +103,7 @@ public class AccountController {
 
     @PutMapping("/enable-list")
     @Operation(summary = "批量更新账户条款")
-    @PreAuthorize("@ss.hasPermission('base:account:update')")
+   // @PreAuthorize("@ss.hasPermission('base:account:update')")
     public CommonResult<Boolean> enableAccountList(@RequestBody List<AccountSaveReqVO> saveReqVOS) {
         accountService.enableAccountList(saveReqVOS);
         return success(true);

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

@@ -13,7 +13,7 @@ public class AccountSaveReqVO {
     private Long id;
 
     @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "类型不能为空")
+   // @NotEmpty(message = "类型不能为空")
     private String type;
 
     @Schema(description = "户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")

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

@@ -67,41 +67,41 @@ public class AccountDO extends BusinessBaseDO {
     @TableField("CSTM_NAME")
     private String customerName;
 
-    /**
+//    /**
-    * 公司编号
+//    * 公司编号
-    */
+//    */
-    @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("ADDRESS")
     private String address;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java

@@ -59,7 +59,7 @@ public class ElementServiceImpl implements ElementService {
         // 校验存在
         validateElementExists(updateReqVO.getId());
         // 校验存在
-       // validateElementCodeExists(updateReqVO.getAbbreviation());
+        validateElementCodeExists(updateReqVO.getAbbreviation());
         // 更新
         ElementDO updateObj = BeanUtils.toBean(updateReqVO, ElementDO.class);
         elementMapper.updateById(updateObj);

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/internalwarehouse/InternalWarehouseController.java

@@ -39,7 +39,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/base/internal-warehouse")
 @Validated
-public class InternalWarehouseController implements BusinessControllerMarker {
+public class InternalWarehouseController implements  BusinessControllerMarker {
 
 
     @Resource