用户 删除

apps/api/admin/user/views.py

@@ -19,7 +19,7 @@ User = get_user_model()
 
 class UserViewSet(CustomModelViewSet):
     permission_classes = [IsAdministrator, ]
-    queryset = User.objects.filter()
+    queryset = User.objects.filter(is_active=True)
     serializer_class = UserSerializer
 
     def filter_queryset(self, queryset):
@@ -41,13 +41,15 @@ class UserViewSet(CustomModelViewSet):
     def destroy(self, request, *args, **kwargs):
         with transaction.atomic():
             instance = self.get_object()
-            log_count = SysLog.objects.filter(user_id=instance.id).count()
-            exam_log_count = ExamLog.objects.filter(user_id=instance.id).count()
-            if log_count > 0 or exam_log_count > 0:
-                raise CustomError(u'该账号有使用记录，禁止删除！')
+            # log_count = SysLog.objects.filter(user_id=instance.id).count()
+            # exam_log_count = ExamLog.objects.filter(user_id=instance.id).count()
+            # if log_count > 0 or exam_log_count > 0:
+            #     raise CustomError(u'该账号有使用记录，禁止删除！')
 
             SysLog.objects.addnew(self.request.user, SysLog.DELETE, u'删除用户[%s]，id=%d' % (instance.username, instance.id))
-            instance.delete()
+            instance.is_active = False
+            instance.username = u'%s|删除|%d' % (instance.username, instance.id)
+            instance.save()
         return response_ok()
 
     @action(methods=['post'], detail=True)

apps/staff/models.py

@@ -146,7 +146,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     department = models.ForeignKey(Department, verbose_name=u"所属部门", null=True, blank=True, on_delete=models.PROTECT)
     username = models.CharField(verbose_name=u'帐号', max_length=30, unique=True, db_index=True)
     name = models.CharField(verbose_name=u'姓名', max_length=30)
-    is_active = models.BooleanField(verbose_name=u'激活', default=True)
+    is_active = models.BooleanField(verbose_name=u'激活', default=True, editable=False, blank=True)
     date_joined = models.DateTimeField(verbose_name=u'注册时间', default=timezone.now, editable=False)
 
     last_refresh = models.DateTimeField(verbose_name=u'刷新时间', null=True, editable=False)

apps/staff/serializers.py

@@ -183,9 +183,9 @@ class UserSerializer(serializers.ModelSerializer):
             raise CustomError(u'密码不能和用户名相同！')
 
         if 'type' in validated_data and validated_data['type'] == User.STAFF:
-            user = User.objects.create_staff(validated_data['username'], validated_data['password'], name=validated_data['name'], is_active=validated_data['is_active'], department=validated_data['department'])
+            user = User.objects.create_staff(validated_data['username'], validated_data['password'], name=validated_data['name'], department=validated_data['department'])
         else:
-            user = User.objects.create_administrator(validated_data['username'], validated_data['password'], name=validated_data['name'], is_active=validated_data['is_active'], department=validated_data['department'])
+            user = User.objects.create_administrator(validated_data['username'], validated_data['password'], name=validated_data['name'], department=validated_data['department'])
         return user
 
     def update(self, instance, validated_data):

uis/admin/user/edit.html

@@ -63,12 +63,14 @@
                     </div>
                   </div>
 
+                  <!--
                 <div class="layui-col-lg6">
                   <label class="layui-form-label">启用：</label>
                   <div class="layui-input-block">
                     <input type="checkbox" name="is_active" lay-skin="switch" lay-text="是|否" checked="" value="1">
                   </div>
                 </div>
+                -->
 
                 <button class="layui-btn" id="submit_btn" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
 

uis/admin/user/index.html

@@ -49,6 +49,7 @@
     <div class="layui-card-body" pad15>
         <form class="layui-form" lay-filter="query-form-element">
           <div class="layui-row layui-col-space10 layui-form-item">
+              <!--
               <div class="layui-col-xs12 layui-col-sm12">
                 <label class="layui-form-label">在职：</label>
                 <div class="layui-input-block">
@@ -59,6 +60,7 @@
                     </select>
                 </div>
             </div>
+            -->
 
               <div class="layui-col-xs12 layui-col-sm12">
                 <label class="layui-form-label">在线：</label>
@@ -135,7 +137,7 @@
         ,{field:'username', title:'用户名',width: 200}
         ,{field:'department_text', title:'所属部门', width:300}
         ,{field:'type_text', title:'类型', width:90}
-        ,{field:'status_text', title:'启用', width:90}
+        //,{field:'status_text', title:'启用', width:90}
         ,{field:'online_text', title:'在线', width:90}
         ,{width:200, align:'left',title: '操作', fixed: 'right', toolbar: '#datagrid-operate-bar'}
       ]]