Merge branch '20240513_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstBbhController.java

@@ -87,7 +87,7 @@ public class LnstBbhController extends BaseController
      */
     @RequiresPermissions("lnst:bbh:edit")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody LnstBbh lnstBbh)
     {
         return toAjax(lnstBbhService.updateLnstBbh(lnstBbh));
@@ -98,9 +98,9 @@ public class LnstBbhController extends BaseController
      */
     @RequiresPermissions("lnst:bbh:remove")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
+	@GetMapping("/remove")
+    public AjaxResult remove(LnstBbh lnstBbh)
     {
-        return toAjax(lnstBbhService.deleteLnstBbhByIds(ids));
+        return toAjax(lnstBbhService.deleteLnstBbhById(lnstBbh.getId()));
     }
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/ILnstBbhService.java

@@ -52,6 +52,6 @@ public interface ILnstBbhService
      * @param ids 需要删除的老年食堂app版本号信息主键集合
      * @return 结果
      */
-    public int deleteLnstBbhByIds(String[] ids);
+    public int deleteLnstBbhById(String ids);
 
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/LnstBbhServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -105,13 +104,13 @@ public class LnstBbhServiceImpl implements ILnstBbhService
     /**
      * 批量删除老年食堂app版本号信息
      *
-     * @param ids 需要删除的老年食堂app版本号信息主键
+     * @param id 需要删除的老年食堂app版本号信息主键
      * @return 结果
      */
     @Override
-    public int deleteLnstBbhByIds(String[] ids)
+    public int deleteLnstBbhById(String id)
     {
-        return lnstBbhMapper.deleteBatchIds(Arrays.asList(ids));
+        return lnstBbhMapper.deleteById(id);
     }
 
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywJclrShxxServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.lnst.domain.InLnstShxx;
 import com.ruoyi.lnst.mapper.ZwywJclrShxxMapper;
 import com.ruoyi.lnst.service.IZwywJclrShxxService;
@@ -68,6 +69,8 @@ public class ZwywJclrShxxServiceImpl implements IZwywJclrShxxService
         }
         if (StringUtils.isNotEmpty(lrHjdz)) {
             zwywJclrShxx.setLrHjdz(null);
+        } else {
+            lrHjdz = SecurityUtils.getAreaCode();
         }
         LambdaQueryWrapper<InLnstShxx> lqw = new LambdaQueryWrapper<>(zwywJclrShxx);
         if (StringUtils.isNotEmpty(lrZjhm)) {

ruoyi-ui/src/api/lnst/bbh.js

@@ -29,8 +29,8 @@ export function addBbh(data) {
 // 修改老年食堂app版本号信息
 export function updateBbh(data) {
   return request({
-    url: '/lnst/bbh',
-    method: 'put',
+    url: '/lnst/bbh/edit',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,8 @@ export function updateBbh(data) {
 // 删除老年食堂app版本号信息
 export function delBbh(id) {
   return request({
-    url: '/lnst/bbh/' + id,
-    method: 'delete'
+    url: '/lnst/bbh/remove',
+    method: 'get',
+    params: { id: id }
   })
 }