前后:企业用户统一社会代码判断

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -421,51 +421,51 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(pageIndex, itemsPe
 			max(goods.F46) AS F46,
 			
 			(
-			if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND 
-			if((max(goods.F02)='1' AND LOCATE('F02', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F03)='1' AND LOCATE('F03', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F04)='1' AND LOCATE('F04', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F05)='1' AND LOCATE('F05', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F06)='1' AND LOCATE('F06', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F07)='1' AND LOCATE('F07', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F08)='1' AND LOCATE('F08', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F09)='1' AND LOCATE('F09', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F10)='1' AND LOCATE('F10', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F11)='1' AND LOCATE('F12', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F13)='1' AND LOCATE('F13', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F14)='1' AND LOCATE('F14', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F15)='1' AND LOCATE('F15', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F16)='1' AND LOCATE('F16', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F17)='1' AND LOCATE('F17', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F18)='1' AND LOCATE('F18', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F19)='1' AND LOCATE('F19', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F20)='1' AND LOCATE('F20', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F21)='1' AND LOCATE('F21', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F22)='1' AND LOCATE('F22', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F23)='1' AND LOCATE('F23', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F24)='1' AND LOCATE('F24', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F25)='1' AND LOCATE('F25', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F26)='1' AND LOCATE('F26', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F27)='1' AND LOCATE('F27', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F28)='1' AND LOCATE('F28', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F29)='1' AND LOCATE('F29', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F30)='1' AND LOCATE('F30', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F31)='1' AND LOCATE('F31', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F32)='1' AND LOCATE('F32', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F33)='1' AND LOCATE('F33', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F34)='1' AND LOCATE('F34', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F35)='1' AND LOCATE('F35', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F36)='1' AND LOCATE('F36', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F37)='1' AND LOCATE('F37', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F38)='1' AND LOCATE('F38', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F39)='1' AND LOCATE('F39', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F40)='1' AND LOCATE('F40', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F41)='1' AND LOCATE('F41', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F42)='1' AND LOCATE('F42', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F43)='1' AND LOCATE('F43', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F44)='1' AND LOCATE('F44', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F45)='1' AND LOCATE('F45', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
-			if((max(goods.F46)='1' AND LOCATE('F46', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) 
+			if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND 
+			if((max(goods.F02)='1' AND LOCATE('F02', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F03)='1' AND LOCATE('F03', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F04)='1' AND LOCATE('F04', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F05)='1' AND LOCATE('F05', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F06)='1' AND LOCATE('F06', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F07)='1' AND LOCATE('F07', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F08)='1' AND LOCATE('F08', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F09)='1' AND LOCATE('F09', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F10)='1' AND LOCATE('F10', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F11)='1' AND LOCATE('F12', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F13)='1' AND LOCATE('F13', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F14)='1' AND LOCATE('F14', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F15)='1' AND LOCATE('F15', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F16)='1' AND LOCATE('F16', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F17)='1' AND LOCATE('F17', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F18)='1' AND LOCATE('F18', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F19)='1' AND LOCATE('F19', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F20)='1' AND LOCATE('F20', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F21)='1' AND LOCATE('F21', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F22)='1' AND LOCATE('F22', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F23)='1' AND LOCATE('F23', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F24)='1' AND LOCATE('F24', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F25)='1' AND LOCATE('F25', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F26)='1' AND LOCATE('F26', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F27)='1' AND LOCATE('F27', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F28)='1' AND LOCATE('F28', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F29)='1' AND LOCATE('F29', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F30)='1' AND LOCATE('F30', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F31)='1' AND LOCATE('F31', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F32)='1' AND LOCATE('F32', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F33)='1' AND LOCATE('F33', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F34)='1' AND LOCATE('F34', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F35)='1' AND LOCATE('F35', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F36)='1' AND LOCATE('F36', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F37)='1' AND LOCATE('F37', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F38)='1' AND LOCATE('F38', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F39)='1' AND LOCATE('F39', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F40)='1' AND LOCATE('F40', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F41)='1' AND LOCATE('F41', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F42)='1' AND LOCATE('F42', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F43)='1' AND LOCATE('F43', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F44)='1' AND LOCATE('F44', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F45)='1' AND LOCATE('F45', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) AND
+			if((max(goods.F46)='1' AND LOCATE('F46', group_concat(DISTINCT header.Code)) >= 0), TRUE, FALSE) 
 			) AS checked
 			
 			 FROM OilSupplier a
@@ -475,9 +475,9 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(pageIndex, itemsPe
 			 LEFT JOIN Base_TableHeader header ON files.NeedFileType=header.Name
 			 LEFT JOIN tmp_OilGoodsAptitudeClass class ON sub.Code=class.Code
 			 LEFT JOIN tmp_OilGoodsAptitude goods ON class.Id=goods.ClassId
-			 WHERE b.SupplierTypeCode='01'
-			 GROUP BY a.Id, b.Id `
+			 WHERE b.SupplierTypeCode='01' and `
 	sql += having
+	sql += ` GROUP BY a.Id, b.Id `
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `
 	} else {
@@ -485,7 +485,7 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(pageIndex, itemsPe
 	}
 	sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
 
-	sqlCount := "SELECT count(*) as total FROM OilSupplier a LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId WHERE b.SupplierTypeCode='03'"
+	sqlCount := "SELECT count(*) as total FROM OilSupplier a LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId WHERE b.SupplierTypeCode='01'"
 
 	var totalResult TotalResult
 	s.DBE.SQL(sql).Find(entitiesPtr)

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

@@ -2148,7 +2148,7 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
 		}
 	}
-	where = where + " and Type in (1, 3)"
+	where = where + " and b.Type in (1, 3)"
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var list []supplier.OilSupplierSelect
 	total := svc.GetPagingTmpCheckedEntities(page.CurrentPage, page.Size, orderby, asc, &list, where)

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -140,11 +140,12 @@ func (this *OilCorporateInfoController) GetSupplierName() {
 // @router /getcommercialno [get]
 func (this *OilCorporateInfoController) GetCommercialNo() {
 	commercialno := this.GetString("commercialno")
+	isCompanyUser := this.GetString("isCompanyUser")
 	sqlStr := "SELECT CommercialNo FROM OilCorporateInfo where CommercialNo='" + commercialno + "' and CheckStatus!='-1'"
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
 	var errorInfo ErrorDataInfo
-	if list != nil {
+	if list != nil && isCompanyUser == "" {
 		errorInfo.Item = true
 		this.Data["json"] = &errorInfo
 		this.ServeJSON()

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplier.js

@@ -194,9 +194,9 @@ export default {
       method: 'GET'
     })
   },
-  signupCommercialNo (commercialNo, supId, myAxios) {
+  signupCommercialNo (commercialNo, supId, isCompanyUser, myAxios) {
     return myAxios({
-      url: 'register/getcommercialno?commercialno=' + commercialNo + '&supId=' + supId,
+      url: 'register/getcommercialno?commercialno=' + commercialNo + '&supId=' + supId + '&isCompanyUser=' + isCompanyUser,
       method: 'GET'
     })
   },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -1422,7 +1422,12 @@ export default {
         }
         // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
         this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, this.$axios).then(res => {
+        let isCompanyUser = ''
+        if (this.authUser.Profile.IsCompanyUser === 1) {
+          isCompanyUser = '1'
+        }
+        console.log(isCompanyUser, 'isCompanyUser')
+        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, isCompanyUser, this.$axios).then(res => {
           console.log(res, 'Item')
           if (res.data.item) {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -1600,7 +1600,12 @@ export default {
         }
         // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
         this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, this.$axios).then(res => {
+        let isCompanyUser = ''
+        if (this.authUser.Profile.IsCompanyUser === 1) {
+          isCompanyUser = '1'
+        }
+        console.log(isCompanyUser, 'isCompanyUser')
+        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, isCompanyUser, this.$axios).then(res => {
           console.log(res, 'Item')
           if (res.data.item) {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -1418,7 +1418,12 @@ export default {
         }
         // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
         this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, this.$axios).then(res => {
+        let isCompanyUser = ''
+        if (this.authUser.Profile.IsCompanyUser === 1) {
+          isCompanyUser = '1'
+        }
+        console.log(isCompanyUser, 'isCompanyUser')
+        api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, isCompanyUser, this.$axios).then(res => {
           console.log(res, 'Item')
           if (res.data.item) {
             this.$message({