eqman

Controller/EquipmentManager.py

@@ -33,20 +33,20 @@ def addNewUserEquipment(userID, deviceContent, response):
                             if is_bind:
                                 # return response.json(175)
                                 # 判断用户密码是否正确
-                                dev_pass = deviceData.get('View_Password', '')
-                                if is_bind[0].View_Password == dev_pass:
-                                    deviceData['NickName'] = is_bind[0].NickName
-                                    if 'isShare' in deviceData:
-                                        deviceData['isShare'] = True
-                                    bind_userID = is_bind[0].userID_id
-                                    userDevice = Device_Info(id=CommonService.getUserID(getUser=False),
-                                                             userID_id=userID,
-                                                             primaryUserID=bind_userID,
-                                                             primaryMaster=ModelService.get_user_name(bind_userID),
-                                                             **deviceData)
-                                    userDevice.save()
-                                else:
-                                    return response.json(111)
+                                # dev_pass = deviceData.get('View_Password', '')
+                                # if is_bind[0].View_Password == dev_pass:
+                                deviceData['NickName'] = is_bind[0].NickName
+                                if 'isShare' in deviceData:
+                                    deviceData['isShare'] = True
+                                bind_userID = is_bind[0].userID_id
+                                userDevice = Device_Info(id=CommonService.getUserID(getUser=False),
+                                                         userID_id=userID,
+                                                         primaryUserID=bind_userID,
+                                                         primaryMaster=ModelService.get_user_name(bind_userID),
+                                                         **deviceData)
+                                userDevice.save()
+                                # else:
+                                #     return response.json(111)
                             else:
                                 userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
                                                          **deviceData)