PC修改登录返回及添加员工账号密码

Controller/PctestController.py

@@ -107,15 +107,17 @@ class PcTest(View):
                 return response.json(104)
             return response.json(111)
 
-        users = user_qs.values('id', 'username', 'password', 'job__jobcode')[0]
+        users = user_qs.values('id', 'username', 'password', 'job__id', 'job__jobcode')[0]
         tko = TokenObject()
         # 加密
         res = tko.generate(
-            data={'id': users['id'], 'username': users['username'], 'password': users['password'], 'job': users['job__jobcode']})
+            data={'id': users['id'], 'username': users['username'], 'password': users['password'], 'jobid': users['job__id'], 'job': users['job__jobcode']})
         res_qs = {
             'res': res,
+            'id': users['id'],
             'username': users['username'],
-            'job': users['job__jobcode']
+            'job': users['job__jobcode'],
+            'jobid': users['job__id']
         }
         return response.json(0, res_qs)
 
@@ -299,7 +301,7 @@ class PcTest(View):
         id = request_dict.get('id', None)
         job_id = request_dict.get('job_id', None)
         param_flag = CommonService.get_param_flag(
-            data=[username, password, job_id])
+            data=[username, job_id])
         if param_flag is not True:
             return response.json(444)
         # 判断员工与岗位是否存在，员工存在返回174