diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 634da53..6de1ddd 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -112,10 +112,7 @@ public class UserEOController extends BaseController { if (userEOService.getUserByLoginName(eo.getAccount(), eo.getUsid()) != null) { return Result.error("用户名已存在!"); } - - userEOService.save(eo); - return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 4ec759d..32eaa3a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -76,7 +76,6 @@ public class UserEOServiceImpl implements IUserEoService { @Override @Transactional(rollbackFor = Exception.class) public void save(UserEO eo) { - // TODO 组织机构和角色 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (StringUtils.isEmpty(eo.getUsid())) { eo.setDelFlag(0); @@ -116,14 +115,14 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEODao.insert(userRoleEO); }); -// // 插入组织关联表 暂时用不上,页面不维护组织机构 -// eo.getOrgList().forEach(c -> { -// UserOrgEO userOrgEO = new UserOrgEO(); -// userOrgEO.setUserId(eo.getUsid()); -// userOrgEO.setOrgId(c.getOrgCode()); -// userOrgEODao.insert(userOrgEO); -// }); - + String[] split = eo.getOrgId().split(","); + // 插入组织关联表 暂时用不上,页面不维护组织机构 + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEODao.insert(userOrgEO); + } } /** diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 0bd0148..ab709c7 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index fc828f2..18fe9e5 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class index 71b4efb..34892b2 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class differ