查询参数

platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormDataController.java

@@ -52,9 +52,8 @@ public class CustomFormDataController {
      */
     @SysLog("新增自定义表单数据表")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('custom-data-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody CustomFormDataDTO customFormDataDTO) {
-        return new R<>(customFormDataService.saveModelByDTO(customFormDataDTO));
+        return new R<>(customFormDataService.saveByDTO(customFormDataDTO));
     }
 
     /**

platform-service/src/main/java/com/platform/service/custom/CustomFormDataService.java

@@ -34,4 +34,5 @@ public interface CustomFormDataService extends IBaseService<CustomFormData, Cust
      */
     AbstractPageResultBean<CustomFormDataVO> selectPageList(CustomFormDataDTO record, int pageNum, int pageSize);
 
+    CustomFormData saveByDTO(CustomFormDataDTO record);
 }

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormDataServiceImpl.java

@@ -42,6 +42,11 @@ public class CustomFormDataServiceImpl extends BaseServiceImpl<CustomFormDataMap
         return new MyPage(mapper.selectList(record));
     }
 
+    @Override
+    public CustomFormData saveByDTO(CustomFormDataDTO record) {
+        return null;
+    }
+
     @Override
     public AbstractPageResultBean<CustomFormData> selectPageInfo(CustomFormDataDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -57,6 +57,18 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
     @Override
     public CustomForm saveByDTO(CustomFormDTO record) {
         CustomForm form = BeanConverterUtil.copyObjectProperties(record,CustomForm.class);
+        if(StringUtils.isEmpty(form.getType())){
+            throw new DeniedException("表单类型不能为空");
+        }
+        if(StringUtils.isEmpty(form.getCategory())){
+            throw new DeniedException("归属分类不能为空");
+        }
+        CustomForm queryForm = new CustomForm();
+        queryForm.setCategory(record.getCategory());
+        queryForm.setType(record.getType());
+        if(mapper.selectCount(queryForm) > 0){
+            throw new DeniedException("该表单已经存在，可前往修改");
+        }
         form.setId(IdGeneratorUtils.getObjectId());
         form.setCreatedTime(LocalDateTime.now());
         form.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
@@ -72,6 +84,17 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
 
     @Override
     public void modByDTO(CustomFormDTO record) {
+        CustomForm oldForm = mapper.selectByPrimaryKey(record.getId());
+        // 判断两个分类和类型是否相同
+        if(!oldForm.getCategory().equals(record.getCategory()) && !oldForm.getType().equals(record.getType())){
+            // 判断数据库中是否存在将要修改的分类和类型
+            CustomForm queryForm = new CustomForm();
+            queryForm.setCategory(record.getCategory());
+            queryForm.setType(record.getType());
+            if(mapper.selectCount(queryForm) > 0){
+                throw new DeniedException("更正的归属分类和表单类型已存在");
+            }
+        }
         // 删除之前的查询属性
         CustomFormBomField fieldQuery = new CustomFormBomField();
         fieldQuery.setFormId(record.getId());