调整错误码

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java

@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import static com.cjy.traceability.framework.common.pojo.CommonResult.error;
 import static com.cjy.traceability.framework.common.pojo.CommonResult.success;
 import static com.cjy.traceability.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -62,7 +63,7 @@ public class TraceabilityBaseController {
     @PreAuthorize("@ss.hasPermission('traceability:base:delete')")
     public CommonResult<Boolean> deleteBase(@RequestParam("id") Integer id) {
         if (baseService.selectIsBindBlock(id)) {
-            return success(false);
+            return error(400, "该基地下存在地块，不能删除");
         }else{
             baseService.deleteBase(id);
             return success(true);

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java

@@ -20,6 +20,8 @@ import com.cjy.traceability.framework.common.pojo.PageParam;
 import com.cjy.traceability.framework.common.pojo.PageResult;
 import com.cjy.traceability.framework.common.pojo.CommonResult;
 import com.cjy.traceability.framework.common.util.object.BeanUtils;
+
+import static com.cjy.traceability.framework.common.pojo.CommonResult.error;
 import static com.cjy.traceability.framework.common.pojo.CommonResult.success;
 
 import com.cjy.traceability.framework.excel.core.util.ExcelUtils;
@@ -62,7 +64,7 @@ public class BlockController {
     public CommonResult<Boolean> deleteBlock(@RequestParam("id") Integer id) {
         boolean result = blockService.selectIsBindCropper(id);
         if(result){
-            return success(false);
+            return error(400,"地块已绑定作物，无法删除");
         }else{
             blockService.deleteBlock(id);
             return  success(true);