Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

jiazx0107

2026-01-17 40671eb79c1805f661fd0e12061dd1b406af9b15

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java

@@ -1,6 +1,7 @@
package com.fzzy.sys.controller.system;

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreCompanyService;
import com.fzzy.igds.service.CoreDeptService;
import com.ruoyi.common.annotation.Log;
@@ -52,6 +53,13 @@
        return deptList;
    }

    @PostMapping("/getDeptByUserType")
    @ResponseBody
    public List<Dept> getDeptByUserType(@RequestBody String parentId) {
        List<Dept> deptByUserType = coreDeptService.getDeptByUserType(parentId);
        return deptByUserType;
    }

    /**
     * 新增部门
     */
@@ -85,11 +93,11 @@
        if(i > 0){
            if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
                //新增公司信息
                coreCompanyService.saveOrUpdate(dept);
                coreCompanyService.saveOrUpdate(dept, true);
            }
            if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
                //新增库区信息
                coreDeptService.saveOrUpdate(dept);
                coreDeptService.saveOrUpdate(dept, true);
            }
        }
        return toAjax(i);
@@ -132,11 +140,11 @@
        if(i > 0){
            if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
                //新增公司信息
                coreCompanyService.saveOrUpdate(dept);
                coreCompanyService.saveOrUpdate(dept, false);
            }
            if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
                //新增库区信息
                coreDeptService.saveOrUpdate(dept);
                coreDeptService.saveOrUpdate(dept, false);
            }
        }
        return toAjax(i);