Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 src/main/java/com/nanometer/smartlab/service/SysUserService.java

@@ -24,7 +24,7 @@
    SysUser getSysUserByIdCard(String idCard);
    boolean isSysUserExist(String arp, String account, String idCard, String editId);
    List<SysUser> getApproverUserList(String department);
    List<SysUser> getHasProjectSysUserList(String department);
    List<SysUser> getHasProjectSysUserList(String department,String project);
    List<SysUser> getApplyUserList();
    List<SysUser> getSeeUserList(String department);
    SysUser insertSysUser(SysUser sysUser);
@@ -48,4 +48,12 @@
    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);

    List<SysUser> getUserByArp(String arp);

    List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);

    void exportUser2Excel(List<Map> list)throws Exception;

    List<String> getLibrarianEmail();

    SysUser getUserByName(String approveUserName);
}