bug

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -39,7 +39,11 @@ func (s *OilContractService) GetHandOnStatisticsList(queryParam HandOnStatistics
 		" LEFT JOIN Base_Organize c on SecondUnit = c.Id"
 	sql += " WHERE a.ImportStatus > 0 and a.Status in (2,3) "
 	if queryParam.YearNum > 0 {
-		sql += " AND " + strconv.Itoa(queryParam.YearNum) + " BETWEEN YEAR(a.StartDate) AND YEAR(a.EndDate)"
+		if queryParam.SupplierType == "02" {
+			sql += " AND YEAR(a.CreateOn) = " + strconv.Itoa(queryParam.YearNum) + " "
+		} else {
+			sql += " AND " + strconv.Itoa(queryParam.YearNum) + " BETWEEN YEAR(a.StartDate) AND YEAR(a.EndDate)"
+		}
 	}
 	if queryParam.SupplierType != "" {
 		sql += " AND a.ContractClass='" + queryParam.SupplierType + "'"

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -444,6 +444,13 @@ func (this *UserController) EditUser() {
 				userentity.UnitId,_ = strconv.Atoi(str[2])
 				userentity.Unit = entity.Fullname
 			}
+			if (str[0] == "100000004" || str[0] == "100000005" || str[0] == "100000009") && str[1] != "" {
+				var entity organize.Base_Organize
+				svc := organize.GetOrganizeService(utils.DBE)
+				svc.GetEntityById(str[1], &entity)
+				userentity.UnitId,_ = strconv.Atoi(str[1])
+				userentity.Unit = entity.Fullname
+			}
 			if len(str) == 1 {
 				var entity organize.Base_Organize
 				svc := organize.GetOrganizeService(utils.DBE)

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

@@ -911,7 +911,7 @@ func (this *OilSupplierCertSubController) AddBusiness() {
 	unitid := unitsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
 	if !has {
 		//添加到准入分类表中
-		if unitid == "100000095" {
+		if unitid == "100000650" {
 			model.CertSubStatus = "1"
 		}
 		_, err = svc.InsertEntityBytbl(OilSupplierCertSubName, &model)

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

@@ -262,6 +262,7 @@ import Base64 from 'base-64'
           window.sessionStorage.setItem('token', res.data.token)
           // Cookies.set('iamCode', iamCode)
           this.$router.push({ path: '/' })
+          window.location.reload()
         } else {
           // this.$router.push({ name: 'login' })
           // this.$router.push({ name: 'loginWqx' })

src/dashoo.cn/frontend_web/src/pages/oilcontract/report/handon-statistics.vue

@@ -26,8 +26,8 @@
             <el-select size="mini" v-model="searchForm.SupplierType" placeholder="请选择" style="width: 100px">
               <el-option label="全部" value="" key="00"></el-option>
               <el-option label="物资类" value="01" key="01"></el-option>
-              <el-option label="服务类" value="02" key="02"></el-option>
-              <el-option label="基建类" value="03" key="03"></el-option>
+              <el-option label="服务类" value="03" key="03"></el-option>
+              <el-option label="基建类" value="02" key="02"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="年度">