Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/GlossaryController.java

@@ -2,12 +2,14 @@ package io.office.modules.manage.controller;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.utils.IPUtils;
 import io.office.modules.app.annotation.Login;
+import io.office.modules.manage.entity.MedicalEntity;
 import io.office.modules.manage.entity.ProductEntity;
 import io.office.modules.manage.entity.SearchgtinlogEntity;
 import io.office.modules.manage.service.SearchgtinlogService;
@@ -101,11 +103,13 @@ public class GlossaryController extends AbstractController {
      */
     @RequestMapping("/delete")
    // @RequiresPermissions("manage:glossary:delete")
-    public R delete(@RequestBody Integer[] ids){
+    public R delete(@RequestBody List<String> ids){
         GlossaryEntity glossary = new GlossaryEntity();
         glossary.setEditor(getUser().getUsername());
         glossary.setLasteditor(getUser().getUsername());
-        glossaryService.updateById(glossary);
+        QueryWrapper<GlossaryEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", ids);
+        glossaryService.update(glossary, queryWrapper);
         return R.ok("术语删除成功!");
     }