暂存

ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java

@@ -54,6 +54,7 @@ public class SysOrderController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(SysOrder sysOrder) {
         startPage();
+//        List<SysUser> users = userService.selectUserList();
         List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
         return getDataTable(list);
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -19,6 +19,8 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    public List<SysUser> selectAllUser();
+
     /**
      * 通过用户名查询用户
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -18,6 +18,8 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    public List<SysUser> selectAllUser();
+
     /**
      * 通过用户名查询用户
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -66,6 +66,11 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> selectAllUser() {
+        return return userMapper.selectUserList();
+    }
+
     /**
      * 通过用户名查询用户
      * 

ruoyi-ui/src/views/custom/order/index.vue

@@ -735,15 +735,15 @@
 
             // console.log(this.form)
 
-            this.form.payType = this.selectDictLabel(this.payTypeIdOptions, this.form.payTypeId);
+            // this.form.payType = this.selectDictLabel(this.payTypeIdOptions, this.form.payTypeId);
-            this.form.preSale = this.selectDictLabel(this.preSaleIdOptions, this.form.preSaleId);
+            // this.form.preSale = this.selectDictLabel(this.preSaleIdOptions, this.form.preSaleId);
-            this.form.afterSale = this.selectDictLabel(this.afterSaleIdOptions, this.form.afterSaleId);
+            // this.form.afterSale = this.selectDictLabel(this.afterSaleIdOptions, this.form.afterSaleId);
-            this.form.nutritionist = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId);
+            // this.form.nutritionist = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId);
-            this.form.nutriAssis = this.selectDictLabel(this.nutriAssisIdOptions, this.form.nutriAssisId);
+            // this.form.nutriAssis = this.selectDictLabel(this.nutriAssisIdOptions, this.form.nutriAssisId);
-            this.form.account = this.selectDictLabel(this.accountIdOptions, this.form.accountId);
+            // this.form.account = this.selectDictLabel(this.accountIdOptions, this.form.accountId);
-            this.form.planner = this.selectDictLabel(this.plannerIdOptions, this.form.plannerId);
+            // this.form.planner = this.selectDictLabel(this.plannerIdOptions, this.form.plannerId);
-            this.form.plannerAssis = this.selectDictLabel(this.plannerAssisIdOptions, this.form.plannerAssisId);
+            // this.form.plannerAssis = this.selectDictLabel(this.plannerAssisIdOptions, this.form.plannerAssisId);
-            this.form.operator = this.selectDictLabel(this.operatorIdOptions, this.form.operatorId);
+            // this.form.operator = this.selectDictLabel(this.operatorIdOptions, this.form.operatorId);
 
             if (this.form.orderId != null) {
               updateOrder(this.form).then(response => {

ruoyi-ui/src/views/login.vue

@@ -65,8 +65,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
+        username: "",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""