From 8488b6537bb110165c951771cd50da337432c5a2 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 21 四月 2022 21:07:04 +0800
Subject: [PATCH] 日计划编辑

---
 WebAPI/Controllers/BaseSet/Gy_ProcessController.cs |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 5da0833..7cb277f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -322,8 +322,8 @@
                 long HDeptID = list[0].HDeptID;
                 long HProcID = list[0].HProcID;
 
-                ////鍒ゆ柇鏉冮檺
-                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+                //鍒ゆ柇鏉冮檺
+                //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
                 //{
                 //    objJsonResult.code = "0";
                 //    objJsonResult.count = 0;
@@ -428,42 +428,43 @@
         {
             try
             {
-                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+                //鏌ョ湅鏉冮檺
                 if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList order by 宸ュ簭浠g爜 ", "h_v_Gy_ProcessList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 宸ュ簭浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
                 }
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
-                }
+
+                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+                //{
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+                //}
+                //else
+                //{
+                //objJsonResult.code = "0";
+                //objJsonResult.count = 0;
+                //objJsonResult.Message = "鏃犳暟鎹�";
+                //objJsonResult.data = null;
+                //return objJsonResult;
+                //}
             }
             catch (Exception e)
             {
@@ -521,19 +522,18 @@
         /// <returns></returns>
         [Route("DeltetGy_Process")]
         [HttpGet]
-        public object DeltetGy_Process(string HItemID,string user)
+        public object DeltetGy_Process(string HItemID, string user)
         {
             DataSet ds;
             DataSet ds1;
-            string ModRightNameCheck = "Gy_Process_Delete";
             try
             {
                 //鍒犻櫎鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+                if (!DBUtility.ClsPub.Security_Log("Gy_Process_Delete", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愬垹闄わ紒";
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1