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

@@ -18,6 +18,8 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,7 +40,6 @@
 */
@RestController
@RequestMapping("/departmentQueryController")
@Slf4j
public class OrgDepartmentQueryController {

    /**
@@ -46,6 +47,11 @@
     */
    @Autowired
    private OrgDeptQueryServiceI deptQueryService;

    /**
     * 日志
     */
    private Logger logger = LoggerFactory.getLogger(getClass());

    /**
     * 部门的树形参照，部门管理也用的这个查询接口
@@ -60,9 +66,9 @@
            return  BaseResult.tree(deptTreeList);
        }catch (Exception e) {
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            log.error("部门树查询时出现错误，原因：" + exceptionMessage);
            return BaseResult.fail("部门树查询时出现错误，原因：" + e.getMessage());
            String exceptionMessage = "部门树查询时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(e.getMessage());
        }
    }

@@ -93,9 +99,9 @@
            return deptQueryService.saveUsersDept(userOids,deptId) ? BaseResult.success("部门分配成功！"):BaseResult.fail("部门分配失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            log.error("关联的部门时出现错误，原因：" + exceptionMessage);
            return BaseResult.fail("关联的部门时出现错误，原因：" + exceptionMessage);
            String exceptionMessage = "关联的部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -110,9 +116,9 @@
            return deptQueryService.addDept(orgDepartmentDTO) ? BaseResult.success("部门添加成功！"):BaseResult.fail("部门添加失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            log.error("添加部门时出现错误，原因：" + exceptionMessage);
            return BaseResult.fail("添加部门时出现错误，原因：" + exceptionMessage);
            String exceptionMessage = "添加部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -127,9 +133,9 @@
            return deptQueryService.updateDept(orgDepartmentDTO) ? BaseResult.success("部门修改成功！"):BaseResult.fail("部门修改失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            log.error("修改部门时出现错误，原因：" + exceptionMessage);
            return BaseResult.fail("修改部门时出现错误，原因：" + exceptionMessage);
            String exceptionMessage = "修改部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -144,9 +150,9 @@
            return deptQueryService.deleteDept(ids) ? BaseResult.success("删除部门成功！"):BaseResult.fail("删除部门失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            log.error("添加部门时出现错误，原因：" + exceptionMessage);
            return BaseResult.fail("添加部门时出现错误，原因：" + exceptionMessage);
            String exceptionMessage = "添加部门时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -156,7 +162,6 @@
     * @param response
     */
    @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.GET)
    @VciUnCheckRight
    public void downloadImportTemplate(String downloadFileName, HttpServletResponse response){
        try {
            String excelPath = deptQueryService.downloadImportTemplate(downloadFileName);
@@ -178,7 +183,6 @@
     * @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);