Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

22 小时以前 e099d0cd93c26b44bc1c10e51944edfad0465b0c

 src/main/java/com/ruoyi/projectManagement/controller/RolesController.java

@@ -2,8 +2,10 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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;
@@ -16,7 +18,7 @@

@RestController
@AllArgsConstructor
@RequestMapping("/roles")
@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {

@@ -25,15 +27,17 @@

    @GetMapping("/listPage")
    @ApiOperation("分页查询所有")
    public AjaxResult listPage(IPage<Roles> page, Roles roles) {
    public AjaxResult listPage(Page<Roles> page, Roles roles) {
        return AjaxResult.success(rolesservice.listPage(page, roles));
    }

    @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")