diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 3a35968..d61b983 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -154,6 +154,12 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="用户所有组织信息") private List infoOrganizeIdList; + @ApiParam(value ="账号ID集合信息") + private List userIdList; + + @ApiParam(value ="用户ID集合信息") + private List userInfoIdList; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 572f63f..4e34946 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -524,10 +524,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy()); @@ -651,6 +654,10 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); + if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + } + // Like DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);