diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ImportMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ImportMapper.java index 1ff7d3c..5b13fcc 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ImportMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ImportMapper.java @@ -59,4 +59,18 @@ public interface ImportMapper { * @return 结果 */ int updateLinkPerson(SysFileInfo personFace); + + /** + * 查询用户是否存在 + * @param arg + * @return + */ + int getUserIsCz(ImportArg arg); + + /** + * 跟新用户信息 + * @param arg + * @return + */ + int updateSysUserInfo(ImportArg arg); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java index 5ab410a..5b4da64 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java @@ -109,11 +109,20 @@ public class ImportServiceImpl implements ImportService { arg.setConsUuid(consUuid); arg.setDeptId(mapper.getDeptId(bean.getUserType())); arg.setPassword(password); + int num=mapper.getUserIsCz(arg); + if(num>0){ + code = mapper.updateSysUserInfo(arg); + }else{ + List addList=new ArrayList<>(); + addList.add(arg); + code = mapper.insertSysUser(bean.getUserType(),addList); + } + if (code == 0) { + throw new RuntimeException("人员账号新增失败"); + } } - code = mapper.insertSysUser(bean.getUserType(),list); - if (code == 0) { - throw new RuntimeException("人员账号新增失败"); - } + // code = mapper.insertSysUser(bean.getUserType(),list); + } result = AjaxResult.success("导入成功"); } catch (Exception e) { diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index 9a2fba3..76dd290 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -218,8 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcp.person_type AS personType, pcp.create_time AS createTime, pcp.update_time AS updateTime - FROM - pt_cons_person pcp + FROM pt_cons_person pcp left join sys_user su on pcp.phone = su.phonenumber WHERE is_active = '1' and cons_user_id = #{consUserId} diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ImportMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ImportMapper.xml index 98350ac..dcb8ae6 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ImportMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ImportMapper.xml @@ -34,6 +34,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + UPDATE sys_user + SET + + dept_id=#{deptId}, + + + user_name = #{arg5}, phonenumber = #{arg5}, + + + nick_name = #{arg1}, + + + user_type=#{type}, + + + id_card=#{arg4}, + + + parent_uuid = #{consUuid}, + + del_flag = '0' + WHERE phonenumber = #{arg5} and del_flag = '0' + + + UPDATE sys_user + SET + + dept_id=#{deptId}, + + + user_name = #{arg4}, phonenumber = #{arg4}, + + + nick_name = #{arg1}, + + + user_type=#{type}, + + + id_card=#{arg7}, + + + parent_uuid = #{consUuid}, + + del_flag = '0' + WHERE phonenumber = #{arg4} and del_flag = '0' + + + insert into @@ -79,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +