From 689f6057c1c56aafaafac4f4d4ae491c6ea92ac9 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 21 Oct 2019 17:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java  | 6 ++++++
 .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java    | 7 +++++++
 2 files changed, 13 insertions(+)

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<String> infoOrganizeIdList;
 
+    @ApiParam(value ="账号ID集合信息")
+    private List<String> userIdList;
+
+    @ApiParam(value ="用户ID集合信息")
+    private List<String> 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);