1

gx_api/GxPress/Model/GxPress.Entity/AdminVerify.cs

@@ -71,7 +71,7 @@ namespace GxPress.Entity
         /// 是否删除
         /// </summary>
         [DataColumn]
-        public string IsDelete { get; set; }
+        public bool IsDelete { get; set; }
 
         /// <summary>
         /// 自己分组ID

gx_api/GxPress/Repository/GxPress.Repository.Implement/AdminVerify/AdminVerifyRepository.cs

@@ -58,7 +58,8 @@ namespace GxPress.Repository.Implement.AdminVerify
             {
                 var guId = Guid.NewGuid().ToString();
                 var createdDate = DateTime.Now.ToString();
-                sqlValue += $@"('{guId}','{createdDate}','{createdDate}',{item.VerifyType.GetHashCode()},{item.DisposeType},{item.AdminId},{item.UserId},{item.SourceId},'{item.Name}','{item.AvatarUrl}','{item.Remark}',{item.SourceType},'{item.SourceName}','{item.IsDelete}'),";
+                var isDelete = item.IsDelete ? 1 : 0;
+                sqlValue += $@"('{guId}','{createdDate}','{createdDate}',{item.VerifyType.GetHashCode()},{item.DisposeType},{item.AdminId},{item.UserId},{item.SourceId},'{item.Name}','{item.AvatarUrl}','{item.Remark}',{item.SourceType},'{item.SourceName}',{isDelete}),";
             }
             sql = sql + sqlValue.Remove(sqlValue.Length - 1, 1);
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
@@ -75,7 +76,10 @@ namespace GxPress.Repository.Implement.AdminVerify
         /// <returns></returns>
         public async Task<bool> DeleteAllAsync(int userId)
         {
-            return await _repository.DeleteAsync(Q.Where(nameof(Entity.AdminVerify.AdminId), userId)) > 0;
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.AdminVerify.AdminId), userId);
+            query.Set(nameof(Entity.AdminVerify.IsDelete), true);
+            return await _repository.UpdateAsync(query) > 0;
         }
 
         /// <summary>
@@ -114,7 +118,7 @@ namespace GxPress.Repository.Implement.AdminVerify
         /// <returns></returns>
         public async Task<IEnumerable<Entity.AdminVerify>> GetAllAsync(SqlKata.Query query)
         {
-            return await _repository.GetAllAsync(query);
+            return await _repository.GetAllAsync(query.Where(nameof(Entity.AdminVerify.IsDelete),false));
         }
 
         /// <summary>
@@ -124,7 +128,11 @@ namespace GxPress.Repository.Implement.AdminVerify
         /// <returns></returns>
         public async Task<int> GetUDisposeCount(int userId)
         {
-            return await _repository.CountAsync(Q.Where(nameof(Entity.AdminVerify.AdminId), userId).Where(nameof(Entity.AdminVerify.DisposeType), AdminVerifyTypeConst.UDispose));
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.AdminVerify.AdminId), userId);
+            query.Where(nameof(Entity.AdminVerify.DisposeType), AdminVerifyTypeConst.UDispose);
+            query.Where(nameof(Entity.AdminVerify.IsDelete), false);
+            return await _repository.CountAsync();
         }
 
         public async Task<bool> UpdateAsync(Query query)

gx_api/GxPress/Service/GxPress.Service.Implement/AdminVerify/AdminVerifyInsetService.cs

@@ -96,7 +96,7 @@ namespace GxPress.Service.Implement.AdminVerify
                             SourceType = request.SourceType,
                             SourceId = request.SourceId,
                             UserId = userId,
-                            IsDelete = "",
+                            IsDelete = false,
                             Remark = request.Remark
                         };
                         adminVerifys.Add(adminVerify);
@@ -116,7 +116,7 @@ namespace GxPress.Service.Implement.AdminVerify
                         SourceId = request.SourceId,
                         UserId = request.UserId,
                         SourceName = group.Name,
-                        IsDelete = "",
+                        IsDelete = false,
                         //获取部门
                         Remark = department.Name + "-" + userDto.Name
                     };

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.cs

@@ -154,8 +154,8 @@ namespace GxPress.Service.Implement.Group
             //不是管理员添加
             if (request.SourceType == 2 || group.IsAdmin && request.SourceType == 1)
             {
-                if (request.SourceType == 1 && string.IsNullOrWhiteSpace(request.Remark))
-                    throw new BusinessException("请填写备注!");
+                // if (request.SourceType == 1 && string.IsNullOrWhiteSpace(request.Remark))
+                //     throw new BusinessException("请填写备注!");
                 var adminVerifyInsertRequest = new AdminVerifyInsertRequest
                 {
                     AdminId = group.UserId,