From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
index 31af996..c2667f4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
@@ -1,18 +1,12 @@
package com.vci.web.controller;
-
-
-
-import com.vci.client.bof.ClientBusinessObject;
-import com.vci.client.uif.actions.client.DataRightUtil;
-import com.vci.client.uif.engine.common.DefaultTableNode;
-import com.vci.client.uif.engine.common.IDataNode;
import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.web.dto.BaseModelDTO;
-import com.vci.web.dto.BaseModelDTOList;
+import com.vci.starter.web.dto.BaseModelDTO;
+import com.vci.starter.web.dto.BaseModelDTOList;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.WebSecretServiceI;
import com.vci.web.util.WebUtil;
@@ -26,7 +20,6 @@
import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
/**
* 鏁版嵁鏉冮檺鎺у埗
@@ -83,7 +76,7 @@
//鍏堝垽鏂瘑绾�
//weidy淇敼锛屾崲鎴愪粠绾跨▼閲岃幏鍙栧綋鍓嶇敤鎴蜂俊鎭�
SessionInfo si = WebUtil.getCurrentUserSessionInfo();
- DataRightUtil dataRightUtil = new DataRightUtil(new HashMap());
+// DataRightUtil dataRightUtil = new DataRightUtil(new HashMap());
StringBuilder sb = new StringBuilder();
return BaseResult.fail("");
}
@@ -97,8 +90,9 @@
* @throws PLException 缂哄皯鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
protected Object getSelectedObject(BaseModelDTO boData) throws PLException {
- IDataNode selectedObject = new DefaultTableNode();
- ClientBusinessObject cbo = new ClientBusinessObject();
+ //姝ゆ柟娉曟病鏈夎寮曠敤锛屼笖IDataNode瀵硅薄娌℃湁
+// IDataNode selectedObject = new DefaultTableNode();
+ BusinessObject cbo = new BusinessObject();
if(StringUtils.isBlank(boData.getOid())){
throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑涓婚敭",new String[0]);
}
@@ -108,15 +102,14 @@
if(StringUtils.isBlank(boData.getNameOid())){
throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑椤逛富閿�",new String[0]);
}
- if(StringUtils.isBlank(boData.getBtmname())){
+ if(StringUtils.isBlank(boData.getBtmName())){
throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑涓氬姟绫诲瀷",new String[0]);
}
- cbo.setOid(boData.getOid());
- cbo.setRevisionid(boData.getRevisionOid());
- cbo.setNameoid(boData.getNameOid());
- cbo.setBtmName(boData.getBtmname());
- selectedObject.setMasterObject(cbo);
- return selectedObject;
+ cbo.oid = boData.getOid();
+ cbo.revoid = boData.getRevisionOid();
+ cbo.nameoid = boData.getNameOid();
+ cbo.btName = boData.getBtmName();
+ return null;
}
--
Gitblit v1.9.3