From c2fa12a34eab9acf275915f551bf7c7d720ca2b1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 20 Feb 2024 09:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java | 1 +
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java | 2 +-
src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java | 18 ++++++++++++++++++
3 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
index c098acc..33da581 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
@@ -110,7 +110,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入ownersCommittee")
public R submit(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
- return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
+ return R.status(ownersCommitteeService.saveOrUpdateOwnersCommittee(ownersCommittee));
}
/**
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java
index e59fe20..1a5d315 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java
@@ -58,4 +58,5 @@
*/
public List<OwnersCommitteeDTO> selectOwnersCommitteeList(OwnersCommitteeDTO ownersCommitteeDTO);
+ Boolean saveOrUpdateOwnersCommittee(OwnersCommitteeEntity ownersCommittee);
}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java
index a04f9b5..2834a95 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java
@@ -29,6 +29,8 @@
import org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMapper;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -80,4 +82,20 @@
return this.baseMapper.selectOwnersCommitteeList(ownersCommitteeDTO);
}
+ @Override
+ public Boolean saveOrUpdateOwnersCommittee(OwnersCommitteeEntity ownersCommittee) {
+ boolean b = saveOrUpdate(ownersCommittee);
+ if (b) {
+ // 更新负责人用户角色
+ IUserService bean = SpringUtils.getBean(IUserService.class);
+ User userInfo = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, ownersCommittee.getPrincipalId()));
+ // 判断角色
+ if (!userInfo.getRoleId().contains("1759487358708310017")) {
+ userInfo.setRoleId(userInfo.getRoleId() + ",1759487358708310017");
+ }
+ bean.updateById(userInfo);
+ }
+ //
+ return b;
+ }
}
--
Gitblit v1.9.3