From 3fd5e7962120c530d145b2d0571cd208d8720563 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 17:55:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 406c8c9..7899ef0 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -52,14 +52,20 @@
@Override
public Integer create(DeviceRole deviceRole) {
-
+ if(Objects.isNull(deviceRole)
+ || StringUtils.isBlank(deviceRole.getName())
+ || Objects.isNull(deviceRole.getType())
+ || Objects.isNull(deviceRole.getIsDefault())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
if(null != deviceRole.getType()) {
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if(null != newDeviceRole) {
+ if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole updateDeviceRole = new DeviceRole();
// 鑻ョ幇鍦ㄦ柊澧炴暟鎹缃粯璁ら棬绂佺粍锛涢偅涔堝厛鎶婁箣鍓嶇殑榛樿闂ㄧ缁勭姸鎬佹敼涓轰笉鏄粯璁ょ殑
updateDeviceRole.setId(newDeviceRole.getId());
@@ -117,7 +123,7 @@
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if(null != newDeviceRole) {
+ if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole update = new DeviceRole();
update.setEdirot(loginUserInfo.getId().toString());
update.setEditDate(new Date());
@@ -163,7 +169,8 @@
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
- .eq(DeviceRole::getType,type);
+ .eq(DeviceRole::getType,type)
+ .last(" limit 1");
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
return getDeviceRole;
--
Gitblit v1.9.3