From 86b6782cd7181b82474e6fbd288ff49c1871eae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=8D=8E=E8=A7=9E?= <2840315406@qq.com> Date: Fri, 25 Jul 2025 11:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1,=E6=95=99=E8=82=B2=E5=B1=80?= =?UTF-8?q?=E5=85=B1=E7=94=A8=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E5=88=92?= =?UTF-8?q?=E5=88=86.=E9=99=A4=E9=A3=9F=E6=9D=90=E7=AE=A1=E7=90=86(?= =?UTF-8?q?=E6=95=99=E8=82=B2=E5=B1=80=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?,=E5=AD=A6=E6=A0=A1=E5=8F=AA=E6=9C=89=E6=9F=A5)=E5=A4=96,?= =?UTF-8?q?=E5=9D=87=E4=B8=BA=E5=AD=A6=E6=A0=A1=E5=8F=AF=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E6=9F=A5,=E6=95=99=E8=82=B2=E5=B1=80=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fdsafe/web/edu/FoodController.java | 23 +++++++++++++++++ .../web/school/AccompanyMealController.java | 23 +++++++++++++++++ .../fdsafe/web/school/CattenController.java | 23 +++++++++++++++++ .../fdsafe/web/school/DishController.java | 25 ++++++++++++++++++- .../fdsafe/web/school/FoodBookController.java | 23 +++++++++++++++++ .../web/school/FoodSampleController.java | 23 +++++++++++++++++ .../web/school/MorningCheckInController.java | 23 +++++++++++++++++ .../MorningInspectionDetailController.java | 23 +++++++++++++++++ .../web/school/RubbishDealController.java | 23 +++++++++++++++++ .../web/school/SchoolStaffController.java | 23 +++++++++++++++++ .../SelfInspectionRecordController.java | 23 +++++++++++++++++ 11 files changed, 254 insertions(+), 1 deletion(-) diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java index 6303360..4265ed3 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.edu; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -41,11 +43,25 @@ public class FoodController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodVO foodVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法添加食材"); + } + } return foodService.saveVO(foodVO); } @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodVO foodVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法修改食材细信息"); + } + } return foodService.updateVO(foodVO); } @@ -54,6 +70,13 @@ public class FoodController extends BaseController { if(foodId == null){ return error("未指定要删除的食材"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法删除食材"); + } + } boolean flag = foodService.removeById(foodId); return flag ? success("删除成功") : error("删除失败"); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java index d5ead7e..0cad90f 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -45,6 +47,13 @@ public class AccompanyMealController extends BaseController { @RequestMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) AccompanyMealVO accompanyMealVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加陪餐记录"); + } + } // wxImage形式 List imageList = accompanyMealVO.getWxAccompanyImage(); if(!CollectionUtils.isEmpty(imageList)){ @@ -55,6 +64,13 @@ public class AccompanyMealController extends BaseController { @RequestMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) AccompanyMealVO accompanyMealVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改陪餐记录"); + } + } // wxImage形式 List imageList = accompanyMealVO.getWxAccompanyImage(); if(!CollectionUtils.isEmpty(imageList)){ @@ -68,6 +84,13 @@ public class AccompanyMealController extends BaseController { if(accompanyMealId == null){ return error("请选择要删除的陪餐记录"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除陪餐记录"); + } + } return accompanyMealService.removeWithId(accompanyMealId); } } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java index cc49c28..2ca3f7e 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -42,6 +44,13 @@ public class CattenController extends BaseController { @PostMapping("/add") public AjaxResult add(@Validated(AddGroup.class) @RequestBody CattenVO cattenVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加食堂"); + } + } // wxImage形式 List imageList = cattenVO.getWxLicenseImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -56,6 +65,13 @@ public class CattenController extends BaseController { @PostMapping("/update") public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody CattenVO cattenVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改食堂信息"); + } + } // wxImage形式 List imageList = cattenVO.getWxLicenseImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -73,6 +89,13 @@ public class CattenController extends BaseController { if (cattenId == null) { return error("请选择要删除的食堂"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除食堂"); + } + } return cattenService.removeById(cattenId) ? success("删除成功") : error("删除失败"); } } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java index 6dba5a2..9ac98f4 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java @@ -2,8 +2,10 @@ package com.zf.foodpurchase.fdsafe.web.school; import com.mysql.cj.xdevapi.Table; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.utils.PageUtils; import com.zf.foodpurchase.common.valigroud.AddGroup; @@ -51,11 +53,25 @@ public class DishController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) DishVO dishVO) { - return dishService.saveVO(dishVO); + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加菜品信息"); + } + } + return dishService.saveVO(dishVO); } @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(AddGroup.class) DishVO dishVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改菜品信息"); + } + } return dishService.updateVO(dishVO); } @@ -64,6 +80,13 @@ public class DishController extends BaseController { if(dishId == null){ return error("未指定要删除的菜品"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除菜品信息"); + } + } boolean flag = dishService.removeById(dishId); return flag ? success("删除成功") : error("删除失败"); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java index 38856f9..e662c38 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -41,11 +43,25 @@ public class FoodBookController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodBookVO foodBookVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加菜谱信息"); + } + } return foodBookService.saveVO(foodBookVO); } @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodBookVO foodBookVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改菜谱信息"); + } + } return foodBookService.updateVO(foodBookVO); } @@ -54,6 +70,13 @@ public class FoodBookController extends BaseController { if(bookId == null){ return error("未指定要删除的菜谱"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除菜谱信息"); + } + } return foodBookService.removeWithId(bookId); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java index 74b8730..1749850 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -43,6 +45,13 @@ public class FoodSampleController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodSampleVO foodSampleVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加留样记录"); + } + } // wxImage形式 List imageList = foodSampleVO.getWxSaveImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -53,6 +62,13 @@ public class FoodSampleController extends BaseController { @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodSampleVO foodSampleVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改留样记录"); + } + } // wxImage形式 List imageList = foodSampleVO.getWxSaveImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -66,6 +82,13 @@ public class FoodSampleController extends BaseController { if(sampleId == null){ return error("未指定要删除的留样记录"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除留样记录"); + } + } return foodSampleService.deleteWithId(sampleId); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java index 71b9838..f6298b1 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -40,11 +42,25 @@ public class MorningCheckInController extends BaseController { @PostMapping("/add") public AjaxResult save(@RequestBody @Validated(AddGroup.class) MorningCheckInVO morningCheckInVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加晨检记录"); + } + } return morningCheckInService.saveVO(morningCheckInVO); } @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) MorningCheckInVO morningCheckInVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改晨检记录"); + } + } return morningCheckInService.updateVO(morningCheckInVO); } @@ -53,6 +69,13 @@ public class MorningCheckInController extends BaseController { if(checkInId == null){ return error("未指定要删除的晨检登记记录"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除晨检记录"); + } + } return morningCheckInService.removewithId(checkInId); } } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java index 321c095..52f20c4 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -82,6 +84,13 @@ public class MorningInspectionDetailController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated({AddGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){ + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加晨检明细记录"); + } + } // wxImage形式 List images = morningInspectionDetailVO.getWxAbnormalImg(); if(!CollectionUtils.isEmpty( images)){ @@ -92,6 +101,13 @@ public class MorningInspectionDetailController extends BaseController { @PostMapping("/update") public AjaxResult update(@RequestBody @Validated({UpdateGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){ + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改晨检明细记录"); + } + } // wxImage形式 List images = morningInspectionDetailVO.getWxAbnormalImg(); if(!CollectionUtils.isEmpty( images)){ @@ -105,6 +121,13 @@ public class MorningInspectionDetailController extends BaseController { if(morningDetailId == null){ return error("未指定要删除的晨检明细"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除晨检明细记录"); + } + } return morningInspectionDetailService.deleteWithId(morningDetailId); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java index 209e27b..566531f 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -43,6 +45,13 @@ public class RubbishDealController extends BaseController { @PostMapping("/add") public AjaxResult add(@Validated(AddGroup.class) @RequestBody RubbishDealVO rubbishDealVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加餐余垃圾处理记录"); + } + } // wxImage形式 List imageList = rubbishDealVO.getWxDealImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -53,6 +62,13 @@ public class RubbishDealController extends BaseController { @PostMapping("/update") public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody RubbishDealVO rubbishDealVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改餐余垃圾处理记录"); + } + } // wxImage形式 List imageList = rubbishDealVO.getWxDealImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -66,6 +82,13 @@ public class RubbishDealController extends BaseController { if(dealId == null){ return error("请选择要删除的厨余垃圾处理记录"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除餐余垃圾处理记录"); + } + } return rubbishDealService.deleteWithId(dealId); } } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java index 0a91393..aeced88 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -48,6 +50,13 @@ public class SchoolStaffController extends BaseController { @PostMapping("/add") public AjaxResult add(@Validated(AddGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加食堂人员"); + } + } // wxImage形式 List imageList = schoolStaffVO.getWxHealthCertImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -58,6 +67,13 @@ public class SchoolStaffController extends BaseController { @PostMapping("/update") public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改食堂人员信息"); + } + } // wxImage形式 List imageList = schoolStaffVO.getWxHealthCertImg(); if(!CollectionUtils.isEmpty(imageList)){ @@ -71,6 +87,13 @@ public class SchoolStaffController extends BaseController { if (staffId == null) { return error("请选择要删除的学校人员"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除学校人员"); + } + } boolean flag = schoolStaffService.removeById(staffId); return flag ? success("删除成功") : error("删除失败"); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java index 0341170..5edab7f 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.school; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -44,6 +46,13 @@ public class SelfInspectionRecordController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法添加监督自查记录"); + } + } // wxImage形式 List selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList(); if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){ @@ -59,6 +68,13 @@ public class SelfInspectionRecordController extends BaseController { @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法修改监督自查记录"); + } + } // wxImage形式 List selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList(); if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){ @@ -77,6 +93,13 @@ public class SelfInspectionRecordController extends BaseController { if(selfRecordId == null){ return error("未指定要删除的自检记录"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法删除监督自查记录"); + } + } return selfInspectionRecordService.deleteWithId(selfRecordId); } }