From f63d8ead25bdb3c32dacca817a059bd30390e9bc Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 15 六月 2022 22:20:07 +0800
Subject: [PATCH] 1.系统账户数据库优化： 修改“账户类型”的数据类型为VARCHAR2(1024)，多个角色时以半角“,”分隔。 加密盐。 密码加密优化；账户登录优化；角色权限管理（作废用户权限）； 2.字典类型管理（定义：用户角色） 3.字典数据管理（初始化用户角色数据） 3.角色权限管理 4.系统账户管理，账户类型对应用户角色（可多选）。
---
web/Dao/GwOrderDao.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index 44532b5..0e1a091 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -285,7 +285,7 @@
GwOrder o = new GwOrder();
if (string.IsNullOrEmpty(orderId))
return o;
- using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from GW_ORDER where ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select gwo.*, gc.COMPANY, gp.name PRODUCT_NAME from gw_order gwo left join gw_client gc on gc.client_id = gwo.client_id left join gw_product gp on gp.id = gwo.product_id where gwo.ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
{
if (((DbDataReader)reader).Read())
{
@@ -313,6 +313,7 @@
o.Company = oracleReaderWrapper.GetString("COMPANY", "");
o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
+ o.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");
o.ComboId = oracleReaderWrapper.GetString("COMBO_ID", "");
o.BasicNum = oracleReaderWrapper.GetInt("BASIC_NUM", 0);
o.GivingNum = oracleReaderWrapper.GetInt("GIVING_NUM", 0);
--
Gitblit v1.9.1