1.0.15 合同新增接口返回修改

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -104,7 +104,7 @@ public class TokenController {
 
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {
-            remoteMessageService.publishMessage(List.of(userId), "欢迎登录RuoYi-Cloud-Plus微服务管理系统");
+            remoteMessageService.publishMessage(List.of(userId), "欢迎登录海威经营管理信息化系统");
         }, 5, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java

@@ -76,8 +76,8 @@ public class ErpContractInfoController extends BaseController {
     @Log(title = "合同信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
-        return toAjax(erpContractInfoService.insertByBo(bo));
+    public R<ErpContractInfoVo> add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
+        return R.ok(erpContractInfoService.insertByBo(bo));
     }
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java

@@ -5,6 +5,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.oa.erp.domain.ErpContractInfo;
 import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -24,6 +26,10 @@ public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, E
      * @param queryWrapper 条件
      * @return 合同信息集合
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "dept_id"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
     public Page<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param("page") Page<ErpContractInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java

@@ -48,7 +48,7 @@ public interface IErpContractInfoService {
      * @param bo 合同信息
      * @return 是否新增成功
      */
-    Boolean insertByBo(ErpContractInfoBo bo);
+    ErpContractInfoVo insertByBo(ErpContractInfoBo bo);
 
     /**
      * 修改合同信息

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java

@@ -47,7 +47,13 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
      */
     @Override
     public ErpContractInfoVo queryById(Long contractId) {
-        return baseMapper.selectVoById(contractId);
+        ErpContractInfoVo contractInfoVo = baseMapper.selectVoById(contractId);
+        MPJLambdaWrapper<ErpContractMaterial> lqw = JoinWrappers.lambda(ErpContractMaterial.class)
+            .selectAll(ErpContractMaterial.class)
+            .eq(contractId != null, ErpContractMaterial::getContractId, contractId);
+        List<ErpContractMaterial> contractMaterialList = contractMaterialMapper.selectList(lqw);
+        contractInfoVo.setContractMaterialList(contractMaterialList);
+        return contractInfoVo;
     }
 
     /**
@@ -108,7 +114,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByBo(ErpContractInfoBo bo) {
+    public ErpContractInfoVo insertByBo(ErpContractInfoBo bo) {
         ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class);
         validEntityBeforeSave(add);
         List<ErpContractMaterial> contractMaterialList = bo.getContractMaterialList();
@@ -120,7 +126,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
                 contractMaterialMapper.insert(erpContractMaterial);
             }
         }
-        return flag;
+        return MapstructUtils.convert(add, ErpContractInfoVo.class);
     }
 
     /**