Merge remote-tracking branch 'origin/master'

jiangping

2024-06-07 73af3ed9fbcc616cdecc739fc4307163c19c5764

 server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java

@@ -32,7 +32,7 @@
 */
@Api(tags = "部门")
@RestController
@RequestMapping("/cloudService/system/department")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/department")
public class SystemDepartmentCloudController extends BaseController {

    @Autowired
@@ -46,8 +46,8 @@
    @PostMapping("/create")
    @CloudRequiredPermission("system:department:create")
    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
        systemDepartment.setCreateUser(getLoginUser().getId());
        systemDepartment.setUpdateUser(getLoginUser().getId());
        systemDepartment.setCreateUser(getLoginUser(token).getId());
        systemDepartment.setUpdateUser(getLoginUser(token).getId());
        return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
    }

@@ -77,8 +77,8 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("system:department:update")
    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
        systemDepartment.setCreateUser(getLoginUser().getId());
        systemDepartment.setUpdateUser(getLoginUser().getId());
        systemDepartment.setCreateUser(getLoginUser(token).getId());
        systemDepartment.setUpdateUser(getLoginUser(token).getId());
        systemDepartmentBiz.updateById(systemDepartment);
        return ApiResponse.success(null);
    }