ptr登陆测试

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -24,8 +24,8 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	//获取总记录数
 	sqlCount := `select count(*) from ` + supplierTableName + ` a `
 	sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
-	sqlCount += ` left join ` + OilInfoChangeName + " c on c.SupplierId = a.Id"
-	sqlCount += ` left join ` + OilSupplierFileName + ` d on d.SupplierId = a.Id `
+	// sqlCount += ` left join ` + OilInfoChangeName + " c on c.SupplierId = a.Id"
+	// sqlCount += ` left join ` + OilSupplierFileName + ` d on d.SupplierId = a.Id `
 	sqlCount += ` where ` + where
 
 	var sql string
@@ -42,12 +42,12 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
 	sql += ` b.WorkflowId, `
-	sql += ` b.ApplyTime, `
-	sql += ` c.OldSupplierName `
+	sql += ` b.ApplyTime `
+	// sql += ` c.OldSupplierName `
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + ` b on b.SupplierId = a.Id `
-	sql += ` left join ` + OilInfoChangeName + ` c on c.SupplierId = a.Id `
-	sql += ` left join ` + OilSupplierFileName + ` d on d.SupplierId = a.Id `
+	// sql += ` right join ` + OilInfoChangeName + ` c on c.SupplierId = a.Id `
+	// sql += ` left join ` + OilSupplierFileName + ` d on d.SupplierId = a.Id `
 	sql += ` where ` + where
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -55,7 +55,7 @@ func (this *SelectController) GetTList() {
 	// //获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1"
-	orderby := "Id"
+	orderby := "a.Id"
 	asc := false
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -195,7 +195,7 @@
                       type="password"
                       v-model="model.password"
                       placeholder="请输入密码"
-                      @keyup.enter.native="login()"
+                      @keyup.enter.native="loginall()"
                     />
                   </el-form-item>
                   <el-button