机关业务指导处

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDeptOrganController.java

@@ -37,8 +37,8 @@ public class SysDeptOrganController extends BaseController {
      */
     @GetMapping("/list")
     @ApiOperation("获取机关指导处列表")
-    public AjaxResult list() {
-        List<SysDeptOrgan> deptOrganList = sysDeptOrganService.selectList();
+    public AjaxResult list(SysDeptOrgan deptOrgan) {
+        List<SysDeptOrgan> deptOrganList = sysDeptOrganService.selectList(deptOrgan);
         return success(deptOrganList);
     }
 
@@ -57,11 +57,9 @@ public class SysDeptOrganController extends BaseController {
     @Log(title = "机关指导处管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ApiOperation("新增机关指导处")
-    public AjaxResult add(@RequestBody SysDeptOrgan deptOrgan) {
+    public AjaxResult add(@RequestBody List<SysDeptOrgan> deptOrganList) {
         Long userId = getUserId();
-        deptOrgan.setCreateBy(String.valueOf(userId));
-        deptOrgan.setCreateTime(new Date());
-        return sysDeptOrganService.insertDeptOrgan(deptOrgan);
+        return sysDeptOrganService.insertDeptOrgan(deptOrganList, userId);
     }
 
     /**

purchase-system/src/main/java/com/ozs/system/service/SysDeptOrganService.java

@@ -18,15 +18,14 @@ public interface SysDeptOrganService {
      *
      * @return
      */
-    List<SysDeptOrgan> selectList();
+    List<SysDeptOrgan> selectList(SysDeptOrgan deptOrgan);
 
     AjaxResult selectListMap();
 
     /**
-     * @param deptOrgan
      * @return
      */
-    AjaxResult insertDeptOrgan(SysDeptOrgan deptOrgan);
+    AjaxResult insertDeptOrgan(List<SysDeptOrgan> deptOrganList, Long userId);
 
     /**
      * 删除机关指导处

purchase-system/src/main/java/com/ozs/system/service/impl/SysDeptOrganServiceImpl.java

@@ -8,12 +8,13 @@ import com.ozs.system.domain.SysDeptOrgan;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysDeptOrganMapper;
 import com.ozs.system.service.SysDeptOrganService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 
@@ -32,31 +33,22 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
 
 
     @Override
-    public List<SysDeptOrgan> selectList() {
-        Long deptId = SecurityUtils.getDeptId();
-        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
-        List<Long> list = new ArrayList<>();
-        list.add(deptId);
-        //本级和上级
-        if (!ObjectUtils.isEmpty(sysDept) && !ObjectUtils.isEmpty(sysDept.getParentId())) {
-            list.add(sysDept.getParentId());
-        }
+    public List<SysDeptOrgan> selectList(SysDeptOrgan deptOrgan) {
         LambdaQueryWrapper<SysDeptOrgan> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SysDeptOrgan::getDeptId, list);
+        wrapper.eq(SysDeptOrgan::getDeptId, deptOrgan.getDeptId());
         List<SysDeptOrgan> organs = deptOrganMapper.selectList(wrapper);
         return organs;
     }
 
     @Override
     public AjaxResult selectListMap() {
-        HashMap<String, List<SysDeptOrgan>> hashMap = new HashMap<>();
+        HashMap<String, List<SysDeptOrgan>> hashMap = new LinkedHashMap<>();
         Long deptId = SecurityUtils.getDeptId();
         SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
         //本部门
         LambdaQueryWrapper<SysDeptOrgan> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysDeptOrgan::getDeptId, deptId);
         List<SysDeptOrgan> organs = deptOrganMapper.selectList(wrapper);
-        hashMap.put(sysDept.getDeptName(), organs);
         //上级
         LambdaQueryWrapper<SysDeptOrgan> wrapperT = new LambdaQueryWrapper<>();
         List<SysDeptOrgan> organsT;
@@ -66,16 +58,20 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
             SysDept sysDeptTwo = sysDeptMapper.selectDeptById(deptId);
             hashMap.put(sysDeptTwo.getDeptName(), organsT);
         }
+        hashMap.put(sysDept.getDeptName(), organs);
         return AjaxResult.success(hashMap);
     }
 
     @Override
-    public AjaxResult insertDeptOrgan(SysDeptOrgan deptOrgan) {
-        if (deptOrganMapper.insert(deptOrgan) == 1) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error("网络出小差，请稍后重试");
+    public AjaxResult insertDeptOrgan(List<SysDeptOrgan> deptOrganList, Long userId) {
+        if (!ObjectUtils.isEmpty(deptOrganList)) {
+            for (SysDeptOrgan organ : deptOrganList) {
+                organ.setCreateBy(String.valueOf(userId));
+                organ.setCreateTime(new Date());
+                deptOrganMapper.insert(organ);
+            }
         }
+        return AjaxResult.success();
     }
 
     @Override