Merge branch 'feature/其他绩效类别' into release/v23.2.19高县版

performance/Performance.Services/EmployeeService.cs

@@ -941,7 +941,7 @@ public ApiResponse<List<per_apr_amount_type>> GetAprTypeList(int allotId)
         public ApiResponse<AprTypeRequest> InsertAprType(int createUser, AprTypeRequest request)
         {
             if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
-                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能填空或者小于1");
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能为空！");
             var tepm = perAprAmountTypeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
             if (tepm != null)
                 return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
@@ -959,8 +959,8 @@ public ApiResponse<AprTypeRequest> InsertAprType(int createUser, AprTypeRequest
         public ApiResponse<AprTypeRequest> UpdateAprType(int typeId, AprTypeRequest request)
         {
             if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
-                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能填空或者小于1");
-            var tepm = perAprAmountTypeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能为空！");
+            var tepm = perAprAmountTypeRepository.GetEntity(t =>t.Id!=t.Id && t.AllotId == request.AllotId && t.PerforType == request.PerforType);
             if (tepm != null)
                 return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
             var res = perAprAmountTypeRepository.GetEntity(t => t.Id == typeId);
@@ -1478,7 +1478,7 @@ public ApiResponse<List<per_apr_amount_hide_type>> GetAprTypeListHide(int allotI
         public ApiResponse<AprTypeRequest> InsertAprTypeHide(int createUser, AprTypeRequest request)
         {
             if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
-                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能填空或者小于1");
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能为空！");
             var tepm = perAprAmountTypeHIdeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
             if (tepm != null)
                 return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
@@ -1496,8 +1496,8 @@ public ApiResponse<AprTypeRequest> InsertAprTypeHide(int createUser, AprTypeRequ
         public ApiResponse<AprTypeRequest> UpdateAprTypeHide(int typeId, AprTypeRequest request)
         {
             if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
-                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能填空或者小于1");
-            var tepm = perAprAmountTypeHIdeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "输入参数不能为空！");
+            var tepm = perAprAmountTypeHIdeRepository.GetEntity(t => t.Id != t.Id && t.AllotId == request.AllotId && t.PerforType == request.PerforType);
             if (tepm != null)
                 return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
             var res = perAprAmountTypeHIdeRepository.GetEntity(t => t.Id == typeId);