fix：订单列表子公司显示非外派

Makefile

@@ -1,6 +1,9 @@
 build:
 	@echo "+ build"
 	go build -o Cold_GoodsOrder6250 main.go
-build-linux:
+build-linux-dev:
 	@echo "+ build linux"
 	GOOS=linux GOARCH=amd64 go build -o Cold_GoodsOrder6250 main.go
+build-linux:
+	@echo "+ build linux"
+	GOOS=linux GOARCH=amd64 go build -o Cold_GoodsOrder main.go

Nats/NatsServer/NatsUser.go

@@ -15,9 +15,9 @@ import (
 // 验证TOKEY
 func Verification(GetCookie string, GetString string) (bool, Account.User, int) {
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if len(User_tokey) == 0 {
 		return false, Account.User{}, 0

controllers/Couriers.go

@@ -55,7 +55,7 @@ func (c *CouriersController) CouriersAdd() {
 	Phone := c.GetString("Phone")
 	Name := c.GetString("T_name")
 	var_ := Function.Couriers{
-		UserId: c.User_r.T_pid,
+		UserId: c.T_pid,
 		Phone:  Phone,
 		Name:   Name,
 	}

controllers/Order.go

@@ -195,7 +195,7 @@ func (c *OrderController) Order_Edit() {
 		c.ServeJSON()
 		return
 	}
-	if c.User_r.T_pid != r.T_pid {
+	if c.T_pid != r.T_pid {
 		c.Data["json"] = lib.JSONS{Code: 205, Msg: "没有权限!"}
 		c.ServeJSON()
 		return

models/Function/Order.go

@@ -17,15 +17,15 @@ import (
 type Order struct {
 	Id                  int       `orm:"column(ID);size(11);auto;pk"`
 	T_pid               int       `orm:"index;size(256);null"`                                  // Account.Company 绑定公司
-	ChildPid            string    `orm:"index;size(256);null"`                                  //子公司id
+	ChildPid            string    `orm:"index;size(256);null"`                                  //  收货单位 Address.Id
 	T_orderid           string    `orm:"size(256);null"`                                        // 订单号
 	T_outorderid        string    `orm:"size(256);null"`                                        // 出库订单号
 	WaybillNo           string    `orm:"size(256);null"`                                        //运单号
 	T_sn                string    `orm:"size(256);null"`                                        // 设备sn
 	DeviceType          string    `orm:"size(256);null"`                                        // 设备类型
 	T_receiving         string    `orm:"size(256);null"`                                        // 收货单位
-	ShippingUnit        string    `orm:"size(256);null"`                                        //发货单位
-	ShippingName        string    `orm:"size(256);null"`                                        //发货单位名称
+	ShippingUnit        string    `orm:"size(256);null"`                                        // 发货单位 Address.Id
+	ShippingName        string    `orm:"size(256);null"`                                        // 发货单位名称
 	T_start_Ut          time.Time `orm:"type(timestamp);null;"`                                 // 起运时间
 	T_end_Ut            time.Time `orm:"type(timestamp);null;"`                                 // 到达时间
 	EstimateEndTime     time.Time `orm:"type(timestamp);null;"`                                 // 预计到达时间
@@ -254,8 +254,8 @@ func Read_Order_List(T_pid int, page int, page_z int, order, sn, startTime, endT
 	} else {
 		offset = int64((page - 1) * page_z)
 	}
-
-	cond := orm.NewCondition().And("T_pid", T_pid).Or("child_pid", T_pid)
+	cond2 := orm.NewCondition()
+	cond := orm.NewCondition().And("T_pid", T_pid).OrCond(cond2.And("child_pid", T_pid).And("IsExpatriate", 1))
 	cond1 := orm.NewCondition().AndCond(cond)
 	if len(order) > 0 {
 		cond1 = cond1.And("T_orderid__icontains", order)