gdg
2021-02-01 126ae649e7bbe07369d8802dd06f546fee138cb1
修改用户arp问题
已修改5个文件
23 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/UserMngController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysUserService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -412,8 +412,14 @@
                    return;
                }
                // 检查ARP号
                if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
                // 检查ARP号 //除自己外的arp
//                if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
//                    FacesUtils.warn("ARP已存在。");
//                    return;
//                }
                List<SysUser> list = sysUserService.getUserByArp(this.sysUser.getArp());
                assert list.size() < 2;
                if (list.size() > 0 && !list.get(0).getId().equals(this.sysUser.getId())) {
                    FacesUtils.warn("ARP已存在。");
                    return;
                }
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -51,4 +51,6 @@
    HazardousWasteUser getUserByAccount(Map params);
    List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);
    List<SysUser> getUserByArp(String arp);
}
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -272,6 +272,10 @@
    AND waster = '1'
    AND project = #{project};
    </select>
    <select id="getUserByArp" resultMap="SysUser">
        select * from sys_user
        where arp = #{0} and valid_flag = 1
    </select>
    <update id="updateUserPointBySelective" parameterType="java.util.Map">
    update sys_user set point=#{point}
    <where>
src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -44,4 +44,6 @@
    HazardousWasteUser getUserByAccount(String account,String name);
    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
    List<SysUser> getUserByArp(String arp);
}
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -369,5 +369,10 @@
        return sysUserDao.getUserByProject(project);
    }
    @Override
    public List<SysUser> getUserByArp(String arp) {
        return sysUserDao.getUserByArp(arp);
    }
}