companyProjecet.git

			@@ -65,7 +65,7 @@
			public function logoImage()
			{
			$model = self::getCalledModule() ?: 'common';
			return $this->hasOne("app\\$model\\model\\file\\UploadFile", 'file_id', 'logo')->bind(['file_path']);
			return $this->hasOne("app\\$model\\model\\file\\UploadFile", 'file_id', 'logo');
			}

			/**
			@@ -76,6 +76,11 @@
			{
			$model = self::getCalledModule() ?: 'common';
			return $this->hasOne("app\\$model\\model\\plus\\business\\Grade", 'grade_id', 'grade_id');
			}
			public function industry()
			{
			$model = self::getCalledModule() ?: 'common';
			return $this->hasOne("app\\$model\\model\\plus\\business\\Industry", 'industry_id', 'industry_id');
			}

			/**
			@@ -127,18 +132,18 @@
			!empty($paramr['province_id']) && $where['province_id'] = $paramr['province_id'];
			!empty($paramr['city_id']) && $where['city_id'] = $paramr['city_id'];
			!empty($paramr['region_id']) && $where['region_id'] = $paramr['region_id'];
			// 检查置顶时间是否过期，如果过期则设置为非置顶
			$this->checkTopExpire();
			if (!empty($paramr['sort'])) {
			$order = ['is_top' => 'desc', 'top_time' => 'desc'];
			if ($paramr['sort'] == 'name') {
			$order = ['name' => "asc"];
			$order['name'] = "asc";
			} else if ($paramr['sort'] == 'time') {
			$order = ['create_time' => "asc"];
			$order['create_time'] = "asc";
			} else {
			$order = ['unit' => "asc"];
			$order['unit'] = "asc";
			}
			} else {
			// 检查置顶时间是否过期，如果过期则设置为非置顶
			$this->checkTopExpire();

			// 按置顶状态和创建时间排序
			$order = ['is_top' => 'desc', 'top_time' => 'desc', 'create_time' => 'desc'];
			}
			@@ -163,6 +168,6 @@
			*/
			public static function detail($business_card_id)
			{
			return (new self())->with(['user', 'image', 'logoImage', 'grade'])->where(['business_card_id' => $business_card_id])->find();
			return (new self())->with(['user', 'image', 'logoImage', 'grade', 'industry'])->where(['business_card_id' => $business_card_id])->find();
			}
			}