From e099d0cd93c26b44bc1c10e51944edfad0465b0c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 05 三月 2026 17:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/projectManagement/pojo/Roles.java | 4 ----
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 11 +++++++----
src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java | 12 ++++++++++++
src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java | 14 +++++++++++---
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index dc4284a..d19b4fc 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
@@ -17,7 +18,7 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/roles")
+@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {
@@ -32,9 +33,11 @@
@PostMapping("/add")
@ApiOperation("鏂板")
- public AjaxResult add(@RequestBody Roles role) {
- role.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
- return AjaxResult.success(rolesservice.save(role));
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
+ if (roleDto.getIsDefaultNo()) {
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
+ }
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
new file mode 100644
index 0000000..a93b483
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
@@ -0,0 +1,12 @@
+package com.ruoyi.projectManagement.dto;
+
+import com.ruoyi.projectManagement.pojo.Roles;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RoleDto extends Roles {
+ // 鏄惁浣跨敤绯荤粺缂栧彿
+ @ApiModelProperty("鏄惁浣跨敤绯荤粺缂栧彿")
+ private Boolean isDefaultNo;
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
index 9cd9dfa..c284f13 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
@@ -38,10 +38,6 @@
@ApiModelProperty(value="鐘舵��(1:鍚敤, 0:绂佺敤)")
private Integer status;
- @ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
index f58c4ed..405084a 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
@@ -1,24 +1,32 @@
package com.ruoyi.projectManagement.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
+import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+@AllArgsConstructor
@Service
-@RequiredArgsConstructor
-@Transactional(rollbackFor = Exception.class)
public class RolesServiceImpl extends ServiceImpl<RolesMapper, Roles> implements RolesService {
private final RolesMapper rolesmapper;
@Override
public IPage<Roles> listPage(Page<Roles> page, Roles roles) {
- return rolesmapper.selectPage(page, null);
+ LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>();
+ if (roles.getName() != null) {
+ queryWrapper.like(Roles::getName, roles.getName());
+ }
+ if (roles.getStatus() != null) {
+ queryWrapper.eq(Roles::getStatus, roles.getStatus());
+ }
+ return rolesmapper.selectPage(page, queryWrapper);
}
}
--
Gitblit v1.9.3