소스 검색

Merge branch 'dev_v1.0.34_wh' of BaseService/biService into feature/v1.0.34

王浩 7 달 전
부모
커밋
1ca29c9701
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      service/company.go

+ 3 - 3
service/company.go

@@ -22,7 +22,7 @@ func GetCompanyType(this *biservice.CompanyReq) (int, string) {
 		return status, companStatus
 	}
 	isGroup, isCommerce, companStatus := CompanyType(this.CompanyName)
-	if companStatus == "注销" || && companStatus == "吊销" || companStatus == "撤销" {
+	if companStatus == "注销" || companStatus == "吊销" || companStatus == "撤销" {
 		return status, companStatus
 	}
 	//判断
@@ -147,13 +147,13 @@ func DistributeClueShow(this *biservice.DistributeClueShowReq, allocationCap int
 			lock_position_id := gconv.Int64("lock_position_id")
 			if lock_position_id != 0 {
 				if lock_position_id != this.Datas[0].PositionId {
-					personName:=gconv.String(deptMap[lock_position_id]["name"])
+					personName := gconv.String(deptMap[lock_position_id]["name"])
 					if IsSameDepartment(gconv.String(deptMap[lock_position_id]["deptName"]), gconv.String(deptMap[this.Datas[0].PositionId])) != 1 {
 						return &biservice.DistributeClueShowResp{
 							ErrorCode: 1,
 							ErrorMsg:  personName,
 						}
-					}else {
+					} else {
 						return &biservice.DistributeClueShowResp{
 							ErrorCode: 2,
 							ErrorMsg:  personName,