Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java

@@ -959,7 +959,7 @@
            tree.setOid(cbo.oid);
            tree.setText(cbo.id + " " + cbo.name);
            Map<String,String> attributeMap = new HashMap<>();
            WebUtil.copyValueToCboFromMap(cbo,attributeMap);
            WebUtil.copyValueToMapFromBos(cbo,attributeMap);
            tree.setAttributes(attributeMap);
            tree.setLeaf(true);
            treeList.add(tree);
@@ -1141,19 +1141,21 @@
      if(StringUtils.isBlank(md5Password) || StringUtils.isBlank(userName)){
         return false;
      }
      String sql = " select plpassword from pluser where plusername = :userName";
      /*String sql = " select plpassword from pluser where plusername = :userName";
      Map<String,String> conditionMap = new HashMap<>();
      conditionMap.put("userName",userName.trim());
      List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
      if(CollectionUtils.isEmpty(BusinessObjectList)){
      conditionMap.put("userName",userName.trim());*/
      SmUserVO userVO = this.getUserByUserId(userName);
      //List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
      if(Func.isEmpty(userVO) || Func.isBlank(userVO.getOid())){
         return  false;
      }

      ThreeDES des = new ThreeDES();// 实例化一个对�?
      des.getKey("daliantan0v0");// 生成密匙
      //ThreeDES des = new ThreeDES();// 实例化一个对�?
      //des.getKey("daliantan0v0");// 生成密匙
      //对查询出来的密码解密
      String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
      plpassword = des.getDesString(plpassword);
      //String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
      String plpassword = userVO.getPassword();
      //plpassword = des.getDesString(plpassword);
      if(md5Password.equals(plpassword)){
         return true;
      }
@@ -1671,9 +1673,9 @@
    * @throws VciBaseException
    */
   @Override
   public List<SmUserVO> listUserByUserType() throws PLException {
   public List<SmUserVO> listUserByUserType(Integer type) throws PLException {
      try {
         UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
         UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(type != null ? type.shortValue() :Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
         return userInfoArr2VO(userInfo);
      } catch (PLException e) {
         throw new VciBaseException("登录时，获取用户信息失败："+e.getMessage());