Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

7 小时以前 620bb4712a31791231c4381581f0f60088f079fe

 src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java

@@ -5,8 +5,7 @@
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.collaborativeApproval.pojo.NoticeType;
import com.ruoyi.collaborativeApproval.service.NoticeTypeService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -25,7 +24,7 @@
@RestController
@RequestMapping("/noticeType")
@AllArgsConstructor
public class NoticeTypeController extends BaseController {
public class NoticeTypeController {

    private NoticeTypeService noticeTypeService;

@@ -35,8 +34,8 @@
     * @return
     */
    @PostMapping("/add")
    public R<?> add(@RequestBody NoticeType noticeType) {
        return R.ok(noticeTypeService.saveOrUpdate(noticeType));
    public AjaxResult add(@RequestBody NoticeType noticeType) {
        return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
    }

    /**
@@ -45,11 +44,11 @@
     * @return
     */
    @DeleteMapping("/del")
    public R<?> delNoticeType(@RequestBody List<Integer> ids) {
    public AjaxResult delNoticeType(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return R.fail("请选择至少一条数据");
            return AjaxResult.error("请选择至少一条数据");
        }
        return R.ok(noticeTypeService.removeBatchByIds(ids));
        return AjaxResult.success(noticeTypeService.removeBatchByIds(ids));
    }

    /**
@@ -57,8 +56,8 @@
     * @return
     */
    @GetMapping("/list")
    public R<?> noticeTypeList() {
        return R.ok(noticeTypeService.list());
    public AjaxResult noticeTypeList() {
        return AjaxResult.success(noticeTypeService.list());
    }

}