更新返回值引用

fs-admin/src/main/java/com/fs/his/controller/FsPhysicalReportTemplateFieldController.java

@@ -2,7 +2,7 @@ package com.fs.his.controller;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.ServletUtils;
@@ -114,7 +114,7 @@ public class FsPhysicalReportTemplateFieldController extends BaseController {
     @PostMapping("/getTemplateField/{templateId}")
     public R getTemplateField(@PathVariable String templateId) {
         if (StringUtils.isNull(templateId)) {
-            return R.failed("操作失败，模板ID不能为空！");
+            return R.error("操作失败，模板ID不能为空！");
         }
         return fsPhysicalReportTemplateFieldService.getTemplateField(templateId);
     }

fs-admin/src/main/java/com/fs/qw/controller/QwUserController.java

@@ -1,6 +1,6 @@
 package com.fs.qw.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.qw.param.QwFsUserParam;
@@ -32,6 +32,6 @@ public class QwUserController extends BaseController {
      * **/
     @GetMapping("/getQwUserInfo")
     public R getQwUserInfo(QwFsUserParam param){
-        return R.ok(qwUserService.getQwUserInfo(param));
+        return R.ok().put("data",qwUserService.getQwUserInfo(param));
     }
 }

fs-company/src/main/java/com/fs/company/controller/company/CompanyDomainBindController.java

@@ -3,7 +3,7 @@ package com.fs.company.controller.company;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.param.CompanyDomainBindParam;
 import com.fs.company.vo.CompanyDomainBindVo;
@@ -122,10 +122,10 @@ public class CompanyDomainBindController extends BaseController
     @PostMapping("/domainBatchBinding")
     public R domainBatchBinding(@RequestBody CompanyDomainBindParam param) {
         if (ObjectUtil.isEmpty(param.getCompanyIds()) || param.getCompanyIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条域名分配信息！");
+            return R.error("绑定失败，至少有一条域名分配信息！");
         }
         if (ObjectUtil.isEmpty(param.getCompanyUserIds()) || param.getCompanyUserIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条分配人员信息！");
+            return R.error("绑定失败，至少有一条分配人员信息！");
         }
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

fs-service/src/main/java/com/fs/his/service/IFsPhysicalReportTemplateFieldService.java

@@ -2,7 +2,7 @@ package com.fs.his.service;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.his.domain.FsPhysicalReportTemplateField;
 import com.fs.his.dto.FsPhysicalReportTemplateFieldDTO;

fs-service/src/main/java/com/fs/his/service/impl/FsPhysicalReportTemplateFieldServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -106,13 +106,13 @@ public class FsPhysicalReportTemplateFieldServiceImpl extends ServiceImpl<FsPhys
         //查询模板信息是否存在
         FsPhysicalReportTemplate reportTemplate = physicalReportTemplateMapper.selectById(templateId);
         if (StringUtils.isNull(reportTemplate)) {
-            return R.failed("操作失败，模板信息不存在！");
+            return R.error("操作失败，模板信息不存在！");
         } else if (!reportTemplate.getStatus().equals("1")) {
-            return R.failed("操作失败，当前模板已禁用！");
+            return R.error("操作失败，当前模板已禁用！");
         }
 
         //查询模板下自定义数据信息
-        return R.ok(baseMapper.selectList(new LambdaQueryWrapper<FsPhysicalReportTemplateField>().eq(FsPhysicalReportTemplateField::getTemplateId, templateId).orderByAsc(FsPhysicalReportTemplateField::getSort)));
+        return R.ok().put("data",baseMapper.selectList(new LambdaQueryWrapper<FsPhysicalReportTemplateField>().eq(FsPhysicalReportTemplateField::getTemplateId, templateId).orderByAsc(FsPhysicalReportTemplateField::getSort)));
     }
 
     @Override