Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
汪云昊 5 years ago
commit 8104b23d12

@ -17,7 +17,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.model.platform.UserDetailModel; import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.repository.*;
@ -168,7 +167,7 @@ public class PersonnelServiceService implements IPersonnelService {
public List<Long> findSysUserIdByOrganizeCode(String... organizeCode) { public List<Long> findSysUserIdByOrganizeCode(String... organizeCode) {
List<Long> result = new ArrayList<>(); List<Long> result = new ArrayList<>();
if(organizeCode != null && organizeCode.length > 0){ if(organizeCode != null && organizeCode.length > 0){
List<SysOrganize> organizeList = organizeRDao.findByHqlWhere(CoreHqlPack.packHqlIds("organizeCode", organizeCode)); List<SysOrganize> organizeList = organizeRDao.findByHqlWhere(CoreHqlPack.packHqlInStr("organizeCode", organizeCode));
if(organizeList != null && organizeList.size() > 0){ if(organizeList != null && organizeList.size() > 0){
List<Long> filterIds = new ArrayList<>(); List<Long> filterIds = new ArrayList<>();
organizeList.forEach(organize -> filterIds.add(organize.getId())); organizeList.forEach(organize -> filterIds.add(organize.getId()));

Loading…
Cancel
Save