diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index 33ea847..f873559 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -36,6 +36,9 @@ public interface IPersonnelService { @ApiOperation(value = "更新用户状态") void updateSysUserInfoStatus(Long userInfoId,Integer status); + @ApiOperation(value = "修改用户主组织信息") + void updateSysUserOrganize(Long userId, Long organizeId); + @ApiOperation(value = "删除账号信息") void deleteSysUser(Long[] userIdList,String userName); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index b372dfa..6512304 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -77,6 +77,23 @@ public class AuthController extends CoreBaseController { } } + + /** + * 获取登录用户信息 + * + * @return 处理结果 + */ + @GetMapping(value = "/get-user-organize") + @ApiOperation(value = "获取会话用户组织信息", notes = "获取当前登录用户账号详细信息") + public ResultBean getUserOrganize() { + LOGGER.info("获取用户信息...lang:{}", AuthUtil.getSessionAttribute("languageCode")); + try { + return new ResultBean(true, "", AuthUtil.getOrganize()); + } catch (ImppBusiException e) { + return new ResultBean(false, e.getErrorDetail() + "-[解决]" + e.getErrorSolution()); + } + } + /** * 获取登录用户功能权限信息 * diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index dbb5e2b..bb227c7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -625,7 +625,7 @@ public class PersonnelController extends CoreBaseController { // 会话工厂信息保存进Redis AuthUtil.setOrganize(organize); - + personnelService.updateSysUserOrganize(AuthUtil.getSessionUser().getUser().getId(),organize.getId()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 9668077..f7c7ff3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -65,7 +65,7 @@ public class SysLocaleLanguageController extends CoreBaseController { sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); - redisCore.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleLanguage.getLanguageCode(),new HashMap<>()); + redisCore.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleLanguage.getLanguageCode(),new HashMap<>()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 44309b8..d080548 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -306,7 +306,7 @@ public class SysMenuController extends CoreBaseController { ValidatorBean.checkNotNull(menu.getParentId(), "父级功能ID不能为空"); menu.setId(Long.parseLong(menu.getMenuCode())); - menu.setMenuSort(Integer.parseInt(menu.getMenuCode())); + menu.setMenuSort(10000); if (!map.containsKey(menu.getMenuCode())) { map.put(menu.getMenuCode(),menu); } else { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java index 20f13eb..f4c5259 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java @@ -17,6 +17,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 989e40f..38923a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -78,7 +78,8 @@ public class SystemInitService implements ISystemInitService { try { List list = dictionaryRDao.findAll(); if(list != null && list.size() > 0){ - Map> parentCodeMap = list.stream().collect(Collectors.groupingBy(SysDictionary::getParentCodeRdd)); + list.stream().filter(sysDictionary-> sysDictionary.getParentCodeRdd() != null).forEach(System.out :: print); + Map> parentCodeMap = list.stream().filter(sysDictionary-> sysDictionary.getParentCodeRdd() != null).collect(Collectors.groupingBy(SysDictionary::getParentCodeRdd)); Map> parentIdMap = list.stream().collect(Collectors.groupingBy(SysDictionary::getParentId)); for (String key : parentCodeMap.keySet()) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index c78514d..99c6db5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -113,6 +113,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public void updateSysUserOrganize(Long userId, Long organizeId) { + LOGGER.debug("平台账号 SysUser userId:{} organizeId",userId, organizeId); + SysUser user = userRDao.getById(userId); + if(user != null){ + user.setOrganizeId(organizeId); + userRDao.save(user); + } + } + + @Override @ApiOperation(value = "删除账号信息") public void deleteSysUser(Long[] userIdList,String userName) { LOGGER.debug("平台账号 SysUser userIdList:{}", userIdList); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 1da4e40..910d9e3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -39,7 +39,7 @@ public class SysDictionaryService implements ISysDictionaryService { public void insertSysDictionary(SysDictionary sysDictionary) { long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "dictionarySoftType"}, new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getDictionarySoftType()}); - if (repeatCodeCount > 0) { + if (sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue() &&repeatCodeCount > 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -87,7 +87,7 @@ public class SysDictionaryService implements ISysDictionaryService { // 校验唯一 String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); long repeatCodeCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); - if (repeatCodeCount > 0) { + if (sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue() &&repeatCodeCount > 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())