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

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -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.tool.DdlPreparedPack;
 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.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.*;
@@ -168,7 +167,7 @@ public class PersonnelServiceService implements IPersonnelService {
     public List<Long> findSysUserIdByOrganizeCode(String... organizeCode) {
         List<Long> result = new ArrayList<>();
         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){
                 List<Long> filterIds = new ArrayList<>();
                 organizeList.forEach(organize -> filterIds.add(organize.getId()));