From 68a3aac25a4b6547668d759e72659877cdf4f42f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 29 Oct 2018 17:46:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/busi/DepartmentController.java | 4 ++-- .../core/apiservice/controller/busi/SysMessageController.java | 6 +++--- .../core/apiservice/controller/busi/SysUserController.java | 2 +- .../i3plus/core/apiservice/controller/busi/ToolController.java | 10 +++++----- .../core/apiservice/serviceimpl/base/SystemLoginService.java | 2 +- .../core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java | 2 +- .../apiservice/serviceimpl/busi/DepartmentServiceImpl.java | 4 ++-- .../core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java | 2 +- .../core/apiservice/serviceimpl/busi/SysUserServiceImpl.java | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java index 8e35f27..f93a4a8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java @@ -48,7 +48,7 @@ public class DepartmentController { //条件验证 ValidatorBean.beginValid(department) - .notNull("departmentName", department.getDepartmentName()) + .notNull("departmentName", department.getName()) .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); @@ -76,7 +76,7 @@ public class DepartmentController { //条件验证 ValidatorBean.beginValid(department) .checkNotZero("id", department.getId()) - .notNull("departmentName", department.getDepartmentName()) + .notNull("departmentName", department.getName()) .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 685c0fe..00a027e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -47,14 +47,14 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .checkNotZero("messageType",sysMessage.getMessageType()) + .checkNotZero("messageType",sysMessage.getMessageTypeId()) .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); // 添加初始化 ConvertBean.modelInitialize(sysMessage,user); // sysMessage.setMessageSendId(user.getUser().getId()); // sysMessage.setRedSendName(user.getUser().getName()); - sysMessage.setMessageStatus(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); + sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); // TODO 状态 status sysMessageService.insertSysMessage(sysMessage); @@ -97,7 +97,7 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .checkNotZero("messageType",sysMessage.getMessageType()) + .checkNotZero("messageType",sysMessage.getMessageTypeId()) .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); // 添加初始化 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index a113226..1ebd659 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -62,7 +62,7 @@ public class SysUserController { //新增初始化 ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser()); - sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); + sysUser.setUserStatusId(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); sysUser.setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); SysUser user = sysUserService.insertSysUser(sysUser); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index 533a8c3..c3d7bb3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -49,14 +49,14 @@ public class ToolController { ValidatorBean.beginValid(tool) .notNull("name",tool.getName()) .notNull("toolTypeId",tool.getToolTypeId()) - .notNull("toolConnType",tool.getToolConnType()) - .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolConnType",tool.getToolConnTypeId()) + .notNull("toolDataType",tool.getToolDataTypeId()) .notNull("toolIp",tool.getToolIp()) .notNull("toolPort",tool.getToolPort()); // 添加初始化 ConvertBean.modelInitialize(tool,user); - tool.setToolStatus(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); + tool.setToolStatusId(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); toolService.insertTool(tool); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -82,8 +82,8 @@ public class ToolController { ValidatorBean.beginValid(tool) .notNull("name",tool.getName()) .notNull("toolTypeId",tool.getToolTypeId()) - .notNull("toolConnType",tool.getToolConnType()) - .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolConnType",tool.getToolConnTypeId()) + .notNull("toolDataType",tool.getToolDataTypeId()) .notNull("toolIp",tool.getToolIp()) .notNull("toolPort",tool.getToolPort()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index 00e4f8a..94fa4a1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -125,7 +125,7 @@ public class SystemLoginService implements ISystemLoginService { sessionUser.setLanguageCode(languageCode); // sessionUser.setSiteCode(user.getFactoryCode()); // sessionUser.setUserName(user.getName()); - sessionUser.setUserType(userType); + sessionUser.setUserTypeId(Integer.parseInt(userType)); // sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); return sessionUser; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java index b8e4fa1..bb3b4fd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java @@ -49,7 +49,7 @@ public class CoreTreeServiceImpl implements ICoreTreeService { } } - LOGGER.info("【{}】包含子集：{},步长：{}",parent.getDepartmentName(),childDepList.size(),step); + LOGGER.info("【{}】包含子集：{},步长：{}",parent.getName(),childDepList.size(),step); parent.setChildList(childDepList); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java index 5246b0b..7424690 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java @@ -46,7 +46,7 @@ public class DepartmentServiceImpl implements IDepartmentService { Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); - department.setRedParentName(parentPosition.getDepartmentName()); + department.setRedParentName(parentPosition.getName()); } // 查询所属组织名称 @@ -87,7 +87,7 @@ public class DepartmentServiceImpl implements IDepartmentService { Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); - department.setRedParentName(parentPosition.getDepartmentName()); + department.setRedParentName(parentPosition.getName()); } // 查询所属组织名称 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java index 9885db9..d003b03 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java @@ -39,7 +39,7 @@ public class SysRoleServiceImpl implements ISysRoleService { public void updateSysRoleStatus(String id, int status, SessionUser user) { LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRDao.getById(Long.parseLong(id)); - role.setRoleStatus(status); + role.setRoleStatusId(status); role.setModifyUser(user.getUserName()); sysRoleRDao.update(role); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index 152bbcc..e163594 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -98,7 +98,7 @@ public class SysUserServiceImpl implements ISysUserService { public void updateSysUserStatus(String id, int status, SessionUser user) { LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); SysUser sysUser = sysUserRDao.getById(Long.parseLong(id)); - sysUser.setUserStatus(status); + sysUser.setUserStatusId(status); sysUser.setModifyUser(user.getUserName()); sysUserRDao.update(sysUser); } @@ -171,7 +171,7 @@ public class SysUserServiceImpl implements ISysUserService { ValidatorBean.checkNotNull(dep); // 用户部门关系保存 - RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); + RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getName()); refUserDepartmentRDao.save(refUserDepartment); // 组织信息冗余 @@ -182,7 +182,7 @@ public class SysUserServiceImpl implements ISysUserService { } // 冗余 部门信息 - sysUser.setRedDepartmentName(dep.getDepartmentName()); + sysUser.setRedDepartmentName(dep.getName()); } } @@ -322,7 +322,7 @@ public class SysUserServiceImpl implements ISysUserService { public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { sessionUser.setLanguageCode(languageCode); sessionUser.setUserName(user.getName()); - sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType)); + sessionUser.setUserTypeId(Integer.parseInt(CommonEnumUtil.USER_TYPE.valueOf(userType))); sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); sessionUser.setRoleList(user.getRoleList()); sessionUser.setDepartmentList(user.getDepartmentList()); From 646a3a5cb279699d7f8b156970305183f4324c21 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 17:46:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?POM=20Bug=20=E4=BF=AE=E5=A4=8D=20prop=20=20?= =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-apiservice/pom.xml | 2 +- .../src/main/resources/application-dev.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 1955290..082b8ba 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -125,7 +125,7 @@ src/main/java - src/test/java + src/main/java src/main/resources diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 1c52958..60df9e7 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -12,10 +12,10 @@ filter.shiro.admin.filteruri = /adoperate/* #用户授权过滤路径 filter.shiro.saadmin.filteruri = /saoperate/* -#是否允许前端跨域提交 -impp.web.cross = true +#是否允许前端跨域提交impp.web.cross.hosts +impp.web.cross = false #允许前端跨域提交ip地址，多个以逗号分隔 -impp.web.cross.hosts = http://127.0.0.1,http://localhost +impp.web.cross.hosts = http://localhost ################ 主数据源 ################ # mysql From dd58bd9c2e55aef2934f1351ff2fd147442fa2ba Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 17:47:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Tree=20=E6=A0=91=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/TreeController.java | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java new file mode 100644 index 0000000..af2abd0 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Position; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-29 14:56 + * @Modify : + **/ +@RestController +@RequestMapping("/tree") +@Api(description = "树服务") +public class TreeController { + + public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class); + + @Autowired + private ICoreTreeService coreTreeService; + + @GetMapping(value="/position/get/{id}") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + public ResultBean listPositionTree(@PathVariable("id") long id) { + try { + Position position = coreTreeService.getPositionTreeByParentId(id); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(position); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + + @GetMapping(value="/position/list/{parentId}") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + public ResultBean listPositionListTree(@PathVariable("parentId") long parentId) { + try { + List positionList = coreTreeService.findPositionTreeByParentId(parentId); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(positionList); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + +} From d3bb38283d059030ae602b0ea6ad04d3531cc318 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 18:01:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ICoreTreeService.java | 25 +++++++++ .../apiservice/controller/CoreTreeController.java | 2 +- .../apiservice/controller/base/AuthController.java | 48 +++++++++++++++- .../serviceimpl/busi/CoreTreeServiceImpl.java | 64 +++++++++++++++++++--- .../serviceimpl/busi/SysUserServiceImpl.java | 22 ++++++-- 5 files changed, 146 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 07666c1..b595717 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Position; + +import java.util.List; /** * @Description : 通用树查询服务 @@ -19,4 +22,26 @@ public interface ICoreTreeService { * @param step 层级 */ void findDepartmentChildrenTreePack(Department parent,int step); + + /** + * 获取岗位树 + * @param parentId + * @return + */ + List findPositionTreeByParentId(long parentId); + + /** + * 获取岗位树 + * @param id + * @return + */ + Position getPositionTreeByParentId(long id); + + /** + * 生成子集树递归方法 + * @param parent 父类对象 + * @param step 层级 + */ + void findPositionChildrenTreePack(Position parent,int step); + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java index 8f0fe3a..01a95a3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java @@ -38,7 +38,7 @@ import java.util.Locale; * @Modify: **/ @RestController -@RequestMapping("/core/tree") +@RequestMapping("/demo/tree") @Api(description="系统服务demo") public class CoreTreeController { private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class); 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 38b869e..5d13663 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 @@ -2,13 +2,16 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; +import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; -import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -18,7 +21,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; /** @@ -47,12 +49,17 @@ public class AuthController { public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode){ LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); try { + ValidatorBean.checkNotNull(loginName,"用户名不能为空"); + ValidatorBean.checkNotNull(loginPwd,"密码不能为空"); + ValidatorBean.checkNotNull(languageCode,"语言不能为空"); + SessionUser user = userService.queryUserLogin(loginName,loginPwd,languageCode); + LOGGER.info("会员登陆：{}",user); AuthUtil.setSessionObject("languageCode",languageCode); String sessionId = request.getSession().getId(); String token = "{accessToken:'"+sessionId+"',expiresIn:1800}"; - return new ResultBean(true,"",token); + return new ResultBean(true,token,AuthUtil.getSessionUser()); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); }catch (Exception e){ @@ -94,4 +101,39 @@ public class AuthController { } + /** + * @Description : 系统资源服务demo + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-26 10:34 + * @Modify: + **/ + @RestController + @RequestMapping("/core/tree") + @Api(description="系统服务demo") + public static class CoreTreeController { + private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class); + + @Autowired + private ICoreTreeService coreTreeService; + + @GetMapping(value="/department") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + public ResultBean listDepartmentTree(long depParentId) { + try { + Department department = coreTreeService.getDepartmentTreeByParentId(depParentId); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(department); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java index b8e4fa1..f98d297 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java @@ -2,7 +2,11 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository; +import cn.estsh.i3plus.pojo.platform.repository.PositionRepository; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import javafx.scene.layout.VBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,31 +29,77 @@ public class CoreTreeServiceImpl implements ICoreTreeService { @Autowired private DepartmentRepository departmentRDao; + @Autowired + private PositionRepository positionRDao; + @Override public Department getDepartmentTreeByParentId(long depParentId) { Department depParent = departmentRDao.getById(depParentId); //封装子集 - findDepartmentChildrenTreePack(depParent,0); + findDepartmentChildrenTreePack(depParent, 0); return depParent; } /** * 封装部门子集 + * * @param parent */ @Override - public void findDepartmentChildrenTreePack(Department parent,int step){ + public void findDepartmentChildrenTreePack(Department parent, int step) { ++step; - List childDepList = departmentRDao.findByProperty("parentId",parent.getId()); + List childDepList = departmentRDao.findByProperty("parentId", parent.getId()); - if(childDepList.size() > 0){ + if (childDepList.size() > 0) { //说明有子集 - for(Department depChild : childDepList){ - findDepartmentChildrenTreePack(depChild,step); + for (Department depChild : childDepList) { + findDepartmentChildrenTreePack(depChild, step); } } - LOGGER.info("【{}】包含子集：{},步长：{}",parent.getDepartmentName(),childDepList.size(),step); + LOGGER.info("【{}】包含子集：{},步长：{}", parent.getName(), childDepList.size(), step); parent.setChildList(childDepList); } + + + @Override + public List findPositionTreeByParentId(long parentId) { + List result = positionRDao.findByProperty("parentId", parentId); + + // 循环设置子集 + if(result != null && result.size() > 0){ + + result.stream().forEach(position -> findPositionChildrenTreePack(position,0)); + } + + return result; + } + + @Override + public Position getPositionTreeByParentId(long id) { + // 查找数据 + Position position = positionRDao.getById(id); + // 数据是否真实存在 + ValidatorBean.checkNotNull(position,"不存在的岗位信息"); + // 递归查询子集 + findPositionChildrenTreePack(position, 0); + + return position; + } + + @Override + public void findPositionChildrenTreePack(Position parent, int step) { + ++step; + List childList = positionRDao.findByProperty("parentId", parent.getId()); + + if (childList.size() > 0) { + //说明有子集 + for (Position child : childList) { + findPositionChildrenTreePack(child, step); + } + } + + LOGGER.info("【{}】包含子集：{},步长：{}", parent.getName(), childList.size(), step); + parent.setChildList(childList); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index 152bbcc..a14e018 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -73,6 +73,15 @@ public class SysUserServiceImpl implements ISysUserService { SysUser user = getSysUserByLoginName(loginName); + if(user == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode()) + .setErrorDetail("用户名不存在") + .setErrorSolution("请重新输入用户名") + .build(); + } + AuthenticationToken token = null; switch (user.getUserTypeId()) { case 2: @@ -98,7 +107,7 @@ public class SysUserServiceImpl implements ISysUserService { public void updateSysUserStatus(String id, int status, SessionUser user) { LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); SysUser sysUser = sysUserRDao.getById(Long.parseLong(id)); - sysUser.setUserStatus(status); + sysUser.setUserStatusId(status); sysUser.setModifyUser(user.getUserName()); sysUserRDao.update(sysUser); } @@ -171,7 +180,7 @@ public class SysUserServiceImpl implements ISysUserService { ValidatorBean.checkNotNull(dep); // 用户部门关系保存 - RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); + RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getName()); refUserDepartmentRDao.save(refUserDepartment); // 组织信息冗余 @@ -182,7 +191,7 @@ public class SysUserServiceImpl implements ISysUserService { } // 冗余 部门信息 - sysUser.setRedDepartmentName(dep.getDepartmentName()); + sysUser.setRedDepartmentName(dep.getName()); } } @@ -322,12 +331,17 @@ public class SysUserServiceImpl implements ISysUserService { public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { sessionUser.setLanguageCode(languageCode); sessionUser.setUserName(user.getName()); - sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType)); + sessionUser.setUserTypeId(userType); sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); sessionUser.setRoleList(user.getRoleList()); sessionUser.setDepartmentList(user.getDepartmentList()); sessionUser.setPositionList(user.getPositionList()); sessionUser.setOrganize(user.getOrganize()); + + if(null != user.getPositionList() && user.getPositionList().size() > 0){ + sessionUser.setPosition(user.getPositionList().get(0)); + } + return sessionUser; } From e0d52bbf13e070bbce7638b628ba0dabafc2a1fe Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 20:57:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=20Demo=20=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-apiservice/pom.xml | 12 +++ .../apiservice/controller/base/AuthController.java | 35 ------- .../serviceimpl/base/SystemLoginService.java | 2 +- .../serviceimpl/busi/SysUserServiceImpl.java | 4 +- .../core/apiservice/serviceimpl/busi/TestBase.java | 22 ++--- .../serviceimpl/busi/TestPositionServiceImpl.java | 106 +++++++++++++++------ pom.xml | 14 +++ 7 files changed, 117 insertions(+), 78 deletions(-) diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 082b8ba..c8bf412 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -94,6 +94,18 @@ org.slf4j slf4j-api + + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + test + 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 5d13663..a155880 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 @@ -101,39 +101,4 @@ public class AuthController { } - /** - * @Description : 系统资源服务demo - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-26 10:34 - * @Modify: - **/ - @RestController - @RequestMapping("/core/tree") - @Api(description="系统服务demo") - public static class CoreTreeController { - private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class); - - @Autowired - private ICoreTreeService coreTreeService; - - @GetMapping(value="/department") - @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") - public ResultBean listDepartmentTree(long depParentId) { - try { - Department department = coreTreeService.getDepartmentTreeByParentId(depParentId); - - return ResultBean.success("查询部门树成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(department); - }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); - return ResultBean.fail(busExcep.getErrorShow()); - }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); - } - } - - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index 94fa4a1..fa54917 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -125,7 +125,7 @@ public class SystemLoginService implements ISystemLoginService { sessionUser.setLanguageCode(languageCode); // sessionUser.setSiteCode(user.getFactoryCode()); // sessionUser.setUserName(user.getName()); - sessionUser.setUserTypeId(Integer.parseInt(userType)); + sessionUser.setUserTypeId(userType); // sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); return sessionUser; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index a14e018..695fe3a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -7,7 +7,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; @@ -15,7 +14,6 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -331,7 +329,7 @@ public class SysUserServiceImpl implements ISysUserService { public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { sessionUser.setLanguageCode(languageCode); sessionUser.setUserName(user.getName()); - sessionUser.setUserTypeId(userType); + sessionUser.setUserTypeId(CommonEnumUtil.USER_TYPE.valueOf(userType)); sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); sessionUser.setRoleList(user.getRoleList()); sessionUser.setDepartmentList(user.getDepartmentList()); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 058a0c5..fa8f9a5 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -7,10 +7,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; +import java.util.List; + /** * @Description : * @Reference : @@ -18,27 +21,22 @@ import org.springframework.test.context.web.WebAppConfiguration; * @Date : 2018-10-29 19:12 * @Modify : **/ -@SpringBootTest -@WebAppConfiguration +//@SpringBootTest +//@RunWith(SpringRunner.class) + @RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@AutoConfigureMockMvc public class TestBase { @Before public void init() { - System.out.println("开始测试-----------------"); + System.out.println("-----------------开始测试-----------------"); } @After public void after() { - System.out.println("测试结束-----------------"); + System.out.println("-----------------测试结束-----------------"); } - @Autowired - private IPositionService positionService; - - - @Test - public void test1(){ - System.out.println(positionService); - } } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java index 969ea29..292d082 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java @@ -1,27 +1,79 @@ -//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -// -//import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -///** -// * @Description : -// * @Reference : -// * @Author : wei.peng -// * @Date : 2018-10-29 19:02 -// * @Modify : -// **/ -//@RunWith(SpringRunner.class) -//@SpringBootTest(classes = {cn.estsh.ImppGo.class}) -//public class TestPositionServiceImpl { -// -// @Autowired -// private IPositionService positionService; -// -// @Test -// public void test1(){ -// System.out.println(positionService); -// } -// -//} +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; +import cn.estsh.i3plus.pojo.platform.bean.Position; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 岗位信息测试 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-29 19:02 + * @Modify : + **/ +public class TestPositionServiceImpl extends TestBase { + + @Autowired + private IPositionService positionService; + + /** + * 测试获取 所有岗位 + */ + @Test + @Transactional + public void testListPosition() { + List list = positionService.listPosition(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 主键查询测试 + */ + @Test + @Transactional + public void testGetPositionById() { + Position position = positionService.getPositionById("1056796316849541120"); + System.out.println(JSON.toJSONString(position)); + } + + /** + * 插入数据 测试 + */ + @Test + @Transactional + public void testInsertPosition() { + Position position = new Position(); + position.setName("张三的岗位"); + position.setPositionCode("ZS_CODE"); + position.setPositionDescription("描述该岗位的信息"); + Position pos = positionService.insertPosition(position); + System.out.println(JSON.toJSONString(pos)); + } + + /** + * 删除数据测试 + */ + @Test + @Transactional + public void testDeletePositionById() { + positionService.deletePositionById("105605611393555"); + } + + /** + * 修改数据测试 + */ + @Test + @Transactional + public void testUpdatePosition(){ + Position position = positionService.getPositionById("1056878692237709312"); + position.setName("===>> 改动后的名称"); + positionService.updatePosition(position); + } + + +} diff --git a/pom.xml b/pom.xml index 160703c..97710cc 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,20 @@ ehcache-core 2.6.11 + + + + org.springframework.boot + spring-boot-starter-test + 2.0.3.RELEASE + test + + + junit + junit + 4.12 + test + From 8d8cd3523559a239be8dbd92ccd0decbe69fdb50 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 30 Oct 2018 09:12:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java index d7e4cc2..073222c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java @@ -50,7 +50,7 @@ public class OrganizeServiceImpl implements IOrganizeService { public void updateOrganizeStatus(String id, int status, SessionUser user) { LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user); Organize organize = organizeRDao.getById(Long.parseLong(id)); - organize.setOrganizeStatus(status); + organize.setOrganizeStatusId(status); organize.setModifyUser(user.getUserName()); organizeRDao.update(organize); }