user edit

app/models/User.py

@@ -57,14 +57,21 @@ class User(db.Model, UserMixin):
         return '<User %r>\n' %(self.NAME)
 
     def to_json(self):
-        return {
-            'id': self.ID,
-            'createdatetime': self.CREATEDATETIME.strftime('%Y-%m-%d %H:%M:%S'),
-            'updatedatetime': self.UPDATEDATETIME.strftime('%Y-%m-%d %H:%M:%S'),
-            'loginname': self.LOGINNAME,
-            'name': self.NAME,
+        json = {
+            'userId': self.ID,
+            'createTime': self.CREATEDATETIME.strftime('%Y-%m-%d %H:%M:%S'),
+            'updateTime': self.UPDATEDATETIME.strftime('%Y-%m-%d %H:%M:%S'),
+            'userName': self.LOGINNAME,
+            'nickName': self.NAME,
             'sex': self.SEX,
             'age': self.AGE,
+            "status": "0",
             'photo': self.PHOTO,
             #'employdate': self.EMPLOYDATE.strftime('%Y-%m-%d %H:%M:%S'),
-        }        
+        }
+
+        if len(self.organizations) > 0:
+            json['dept']  = self.organizations[0].to_json()
+            json['deptId'] = self.organizations[0].ID
+
+        return json         

app/routes/user.py

@@ -98,7 +98,7 @@ def do_login():
 def index_user():
     return render_template('user/index.html')
 
-@base.route('/base/syuser!grid.action', methods=['POST'])
+@base.route('/system/user/list', methods=['GET'])
 def user_grid():
     filters = []
     if request.form.get('loginname'):
@@ -126,14 +126,19 @@ def user_grid():
         page, per_page=rows, error_out=False)
     users = pagination.items
 
-    return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total})
+    return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total, 'code': 200, 'msg': '查询成功'})
 
-@base.route('/base/syuser!getById.action', methods=['POST'])
-def syuser_getById():
-    user = User.query.get(request.form.get('id'))
+@base.route('/system/user/<id>', methods=['GET'])
+def syuser_getById(id):
+    user = User.query.get(id)
 
     if user:
-        return jsonify(user.to_json())
+        json = {'code': 200, 'msg': '', 'data': user.to_json()}
+        if len(user.roles.all()) > 0:
+            json['roles'] = [role.to_json() for role in user.roles]
+            json['roleIds'] = [role.ID for role in user.roles]
+
+        return jsonify(json)
     else:
         return jsonify({'success': False, 'msg': 'error'})
 

db.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  File Encoding         : 65001
 
- Date: 24/05/2022 14:59:03
+ Date: 24/05/2022 21:43:55
 */
 
 SET NAMES utf8mb4;