|
|
@@ -81,9 +81,10 @@ public class XCFYDataV_STAFF_INFOJob implements Job {
|
|
|
public void addUser(Map<String, Object> dataMap) {
|
|
|
SysUser user = new SysUser();
|
|
|
user.setPassword("123456");
|
|
|
+ user.setDoctorId(dataMap.get("DOCTOR_ID").toString());
|
|
|
user.setUsername(dataMap.get("DOCTOR_ID").toString());
|
|
|
user.setRealname(dataMap.get("DOCTOR_NAME").toString());
|
|
|
- user.setDoctorLevel(dataMap.getOrDefault("DOCTOR_LEVEL", "").toString());
|
|
|
+ user.setDoctorLevel(dataMap.getOrDefault("DOCTOR_LEVEL", "default").toString());
|
|
|
user.setCreateTime(new Date());//设置创建时间
|
|
|
String salt = oConvertUtils.randomGen(8);
|
|
|
user.setSalt(salt);
|
|
|
@@ -93,11 +94,12 @@ public class XCFYDataV_STAFF_INFOJob implements Job {
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
|
|
//用户表字段org_code不能在这里设置他的值
|
|
|
user.setOrgCode(null);
|
|
|
- SysDepart sysDepart = addDepart(dataMap.getOrDefault("DEPT_CODE", "").toString(), dataMap.getOrDefault("DEPT_NAME", "").toString());
|
|
|
- // 保存用户走一个service 保证事务
|
|
|
-// String selectedDeparts = dataMap.getOrDefault("DEPT_CODE", "").toString();
|
|
|
+ if(null != dataMap.get("DEPT_CODE")) {
|
|
|
+ SysDepart sysDepart = addDepart(dataMap.getOrDefault("DEPT_CODE", "").toString(), dataMap.getOrDefault("DEPT_NAME", "").toString());
|
|
|
+
|
|
|
+ sysUserService.saveUser(user, "", sysDepart.getId(), "");
|
|
|
+ }
|
|
|
|
|
|
- sysUserService.saveUser(user, "", sysDepart.getId(), "");
|
|
|
|
|
|
}
|
|
|
|