Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/MarketCustomerResourcesController.cs

@@ -67,7 +67,7 @@ namespace OASystem.API.Controllers
                 if (resultData.Code == 0)
                 {
                     #region 客户资料表操作记录
-                    await GeneralMethod.NewClientOperationRecord(dto.PortType,OperationEnum.NoOperation, dto.OperationUserId, 0, "");
+                    await GeneralMethod.NewClientOperationRecord(dto.PortType, OperationEnum.NoOperation, dto.OperationUserId, 0, "");
                     #endregion
 
                     jw = JsonView(true, "查询成功!", resultData.Data);
@@ -97,11 +97,11 @@ namespace OASystem.API.Controllers
             JsonView jw = new JsonView();
             try
             {
-                Result resultData = await _clientDataRepository._Details(dto.PortType , dto.Id);
+                Result resultData = await _clientDataRepository._Details(dto.PortType, dto.Id);
                 if (resultData.Code == 0)
                 {
                     #region 客户资料表操作记录
-                    await GeneralMethod.NewClientOperationRecord(dto.PortType,OperationEnum.Details, dto.UserId, dto.Id, "");
+                    await GeneralMethod.NewClientOperationRecord(dto.PortType, OperationEnum.Details, dto.UserId, dto.Id, "");
                     #endregion
                     jw = JsonView(true, "查询成功!", resultData.Data);
                 }
@@ -143,17 +143,17 @@ namespace OASystem.API.Controllers
                 }
                 else if (dto.Status == 2) operationEnum = OperationEnum.Edit;
 
-                await GeneralMethod.NewClientOperationRecord(dto.PortType,operationEnum, dto.CreateUserId, dto.Id, "");
+                await GeneralMethod.NewClientOperationRecord(dto.PortType, operationEnum, dto.CreateUserId, dto.Id, "");
                 #endregion
 
-                return Ok(JsonView(true, result.Msg));
+                return Ok(JsonView(true, result.Msg + "Id:" + dto.Id));
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                return Ok(JsonView(false, "程序错误！"));
+                return Ok(JsonView(false, "程序错误！Msg:" + ex.Message));
             }
         }
-        
+
         /// <summary>
         /// 新客户资料操作（删除）
         /// </summary>
@@ -170,7 +170,7 @@ namespace OASystem.API.Controllers
             }
 
             #region 客户资料表操作记录
-            await GeneralMethod.NewClientOperationRecord(dto.PortType, OperationEnum.Details, dto.DeleteUserId, dto.Id, "");
+            await GeneralMethod.NewClientOperationRecord(dto.PortType, OperationEnum.Del, dto.DeleteUserId, dto.Id, "");
             #endregion
 
             return Ok(JsonView(true, "删除成功！"));
@@ -193,7 +193,7 @@ namespace OASystem.API.Controllers
                 await GeneralMethod.NewClientOperationRecord(dto.PortType, OperationEnum.Details, dto.UserId, dto.Id, "");
                 #endregion
 
-                jw = JsonView(true, result.Msg,result.Data);
+                jw = JsonView(true, result.Msg, result.Data);
             }
             else
             {
@@ -212,7 +212,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Result resTable =  _clientDataRepository.QueryUserSelect();
+                Result resTable = _clientDataRepository.QueryUserSelect();
                 return Ok(JsonView(true, resTable.Msg, resTable.Data));
             }
             catch (Exception)
@@ -234,7 +234,7 @@ namespace OASystem.API.Controllers
             {
                 return Ok(JsonView(false, result.Msg));
             }
-            return Ok(JsonView(true, result.Msg,result.Data));
+            return Ok(JsonView(true, result.Msg, result.Data));
         }
 
         /// <summary>