ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复同步Ecology用户，性别转换错误

This commit is contained in:
bo.yang 2021-07-16 10:32:02 +08:00
parent 62ca03c7f9
commit 69311b06d7
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -329,19 +329,17 @@ public class SysDeptServiceImpl implements ISysDeptService
public int deptSync(Map<String,String> mapResult){ public int deptSync(Map<String,String> mapResult){
//如果接口返回状态码不为200，则不做同步处理 //如果接口返回状态码不为200，则不做同步处理
String statusCode=mapResult.get("statusCode"); if(!mapResult.get("statusCode").equals("200"))
String result= mapResult.get("result");
if(!statusCode.equals("200"))
{ {
return 0; return 0;
} }
//取Ecology返回信息中的部门信息 //取Ecology返回信息中的部门信息
Map<String,Object> map = (Map) JSON.parse(result); Map<String,Object> map = (Map) JSON.parse(mapResult.get("result"));
Map<String,Object> dataMap= (Map<String, Object>) map.get("data"); Map<String,Object> dataMap= (Map<String, Object>) map.get("data");
//JSONArray json = (JSONArray) o.get("dataList"); List<EcologyDept> deptList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken<List<EcologyDept>>(){}.getType());
//List<EcologyDept> depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class); /*JSONArray json = (JSONArray) o.get("dataList");
List<EcologyDept> depts= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken<List<EcologyDept>>(){}.getType()); List<EcologyDept> depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class);*/
//清空部门表 //清空部门表
deptMapper.truncateDept(); deptMapper.truncateDept();
@ -359,7 +357,7 @@ public class SysDeptServiceImpl implements ISysDeptService
//同步Ecology部门信息 //同步Ecology部门信息
List<SysDept> list=new ArrayList<>(); List<SysDept> list=new ArrayList<>();
for(EcologyDept ecologyDept:depts){ for(EcologyDept ecologyDept:deptList){
if(ecologyDept.getSubcompanyid1().equals("1")) { //只取分部ID为“1”的部门，排除代理商 if(ecologyDept.getSubcompanyid1().equals("1")) { //只取分部ID为“1”的部门，排除代理商
SysDept dept= insertEcologyDept(ecologyDept); SysDept dept= insertEcologyDept(ecologyDept);
list.add(dept); list.add(dept);
@ -403,7 +401,4 @@ public class SysDeptServiceImpl implements ISysDeptService
} }
updateAncestors(list); updateAncestors(list);
} }
} }

44
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -541,41 +541,41 @@ public class SysUserServiceImpl implements ISysUserService
public int userSync(Map<String,String> mapResult){ public int userSync(Map<String,String> mapResult){
//如果接口返回状态码不为200，则不做同步处理 //如果接口返回状态码不为200，则不做同步处理
String statusCode=mapResult.get("statusCode"); if(!mapResult.get("statusCode").equals("200"))
String result= mapResult.get("result");
if(!statusCode.equals("200"))
{ {
return 0; return 0;
} }
//取Ecology返回信息中的部门信息 //取Ecology返回信息中的部门信息
Map<String,Object> map = (Map) JSON.parse(result); Map<String,Object> map = (Map) JSON.parse(mapResult.get("result"));
Map<String,Object> dataMap= (Map<String, Object>) map.get("data"); Map<String,Object> dataMap= (Map<String, Object>) map.get("data");
List<EcologyUser> ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken<List<EcologyUser>>(){}.getType());
/*JSONArray json = (JSONArray) dataMap.get("dataList"); /*JSONArray json = (JSONArray) dataMap.get("dataList");
List<EcologyUser> ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/ List<EcologyUser> ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/
List<EcologyUser> ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken<List<EcologyUser>>(){}.getType());
//删除从Ecology同步过来（用户类型为02）的用户
userMapper.deleteEcologySyncUser(); userMapper.deleteEcologySyncUser();
SysUser user = new SysUser();
//同步Ecology部门信息 //同步Ecology部门信息
for(EcologyUser ecologyuser:ecologyUserList){ SysUser user = new SysUser();
if(ecologyuser.getSubcompanyid1().equals("1") && StringUtils.isNotEmpty(ecologyuser.getLoginid())) { //只取分部ID为“1”的员工 for(EcologyUser ecologyUser:ecologyUserList){
String sex=ecologyuser.getSex(); if(ecologyUser.getSubcompanyid1().equals("1") && StringUtils.isNotEmpty(ecologyUser.getLoginid())) { //只取分部ID为“1”的员工
if(sex.equals("男")){ String sex="2";
if(ecologyUser.getSex().equals("男")){
sex="0"; sex="0";
}else if(sex.equals("女")){ }
if(ecologyUser.getSex().equals("女")){
sex="1"; sex="1";
}else{ }
sex="2"; user.setUserId(Long.parseLong(ecologyUser.getId()));
}; user.setDeptId(Long.parseLong(ecologyUser.getDepartmentid()));
user.setUserId(Long.parseLong(ecologyuser.getId())); user.setLoginName(ecologyUser.getLoginid());
user.setDeptId(Long.parseLong(ecologyuser.getDepartmentid())); user.setUserName(ecologyUser.getLastname());
user.setLoginName(ecologyuser.getLoginid()); user.setUserType("02"); //设置从Ecology同步的用户类型为02
user.setUserName(ecologyuser.getLastname()); user.setEmail(ecologyUser.getEmail());
user.setUserType("02");
user.setEmail(ecologyuser.getEmail());
user.setSex(sex); user.setSex(sex);
user.setPhonenumber(ecologyuser.getMobile()); user.setPhonenumber(ecologyUser.getMobile());
user.setStatus(ecologyuser.getStatus().equals("5")?"1":"0"); //Ecology为离职状态5，则无效 user.setStatus(ecologyUser.getStatus().equals("5")?"1":"0"); //Ecology为离职状态5，则无效
user.setDelFlag("0"); user.setDelFlag("0");
userMapper.insertUser(user); userMapper.insertUser(user);
} }