Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java

@@ -1,12 +1,9 @@
package com.vci.frameworkcore.controller;

import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -15,8 +12,6 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +63,7 @@
            e.printStackTrace();
            String exceptionMessage = "部门树查询时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(e.getMessage());
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -85,21 +80,21 @@

    /**
     * 保存部门用户关联信息，平台自带查重功能
     * @param userOids 用户id
     * @param userOIds 用户id
     * @param deptId 部门oid
     * @return
     */
    @RequestMapping(value = "/saveUsersDepts",method = RequestMethod.POST)
    public BaseResult saveUsersDepts(String[] userOids, String deptId){
    public BaseResult saveUsersDepts(String[] userOIds, String deptId){
        //不能同时为空
        if(Func.isEmpty(userOids) && Func.isBlank(deptId)){
            return BaseResult.fail("角色主键和部门主键，参数不能同时为空!");
        if(Func.isEmpty(userOIds) && Func.isBlank(deptId)){
            return BaseResult.fail("参数【用户主键】和【部门主键】，不能同时为空!");
        }
        try {
            return deptQueryService.saveUsersDept(userOids,deptId) ? BaseResult.success("部门分配成功！"):BaseResult.fail("部门分配失败！");
            return deptQueryService.saveUsersDept(userOIds,deptId) ? BaseResult.success("部门分配成功！"):BaseResult.fail("部门分配失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = "关联的部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "关联部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -183,6 +178,7 @@
     * @return
     */
    @RequestMapping(value = "/importDept",method = RequestMethod.POST)
    @VciUnCheckRight
    public BaseResult importUser(MultipartFile file){
        String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
        File file1 = new File(excelFileName);