zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ：user/view 修改批量创建用户

This commit is contained in:
zty 2024-06-14 17:38:27 +08:00
parent cd0837970c
commit 5b785dfd79
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/views/system/userExam.vue
View File

@ -115,7 +115,7 @@
</el-form> </el-form>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="danger" @click="close_dialog">取消</el-button> <el-button type="danger" @click="close_dialog">取消</el-button>
<el-button type="primary" @click="submitUpload" :disabled="saveLoading">确认</el-button> <el-button type="primary" @click="submitUpload">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-card> </el-card>
@ -516,9 +516,11 @@ export default {
updateUser(this.user.id, this.user).then((res) => { updateUser(this.user.id, this.user).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.getList(); this.getList();
this.dialogVisible = false; this.dialogVisible = true;
this.impForm.file = ''
this.$message.success("成功"); this.$message.success("成功");
} };
this.impForm.file = ''
}); });
} else { } else {
createUser(this.user).then((res) => { createUser(this.user).then((res) => {

5
server/apps/system/views.py
View File

@ -109,7 +109,7 @@ class ImpMixin:
data_list = self.build_data(sheet, start) data_list = self.build_data(sheet, start)
serializer = mySerializer(data=data_list, many=True, context={'request': request}) serializer = mySerializer(data=data_list, many=True, context={'request': request})
if serializer.is_valid(): if serializer.is_valid():
serializer.save(create_by=request.user, belong_dept=request.user.dept) serializer.save()
else: else:
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@ -349,8 +349,7 @@ class UserExamViewset(ImpMixin, ModelViewSet):
if row[0] is not None: if row[0] is not None:
dept = Organization.objects.get(name=row[2]) dept = Organization.objects.get(name=row[2])
user_depts = get_child_queryset2(self.request.user.dept).order_by('sort') user_depts = get_child_queryset2(self.request.user.dept).order_by('sort')
serializer = OrganizationSerializer(user_depts, many=True) depts = any(i.name==dept.name for i in user_depts)
depts = any(i.id==dept.id for i in serializer.data)
if depts is False: if depts is False:
return Response({'msg': f'本公司下不存在此部门{row[2]}'}) return Response({'msg': f'本公司下不存在此部门{row[2]}'})
serializer_data = { serializer_data = {