处理品种空值null

controllers/company.go

@@ -3274,9 +3274,8 @@ func (this *CompanyController) Detail() {
 								items[itemK].ExpireDay = expireDay
 							}
 						}
+						plist.Items = items
 					}
-
-					plist.Items = items
 					plist.ClassifyName = v.PermissionName
 					plist.CheckList = checkList
 					item.PermissionList = append(item.PermissionList, plist)
@@ -3593,7 +3592,7 @@ func (this *CompanyController) DetailByCreditCode() {
 					plist.Items = make([]*company.PermissionLookItem, 0)
 					items, ok1 := permissionMap[v.ChartPermissionId]
 					if ok1 {
-						plist.Items = items
+
 						for itemK, n := range items {
 							permission, e := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
 							if e != nil && e.Error() != utils.ErrNoRow() {
@@ -3617,6 +3616,7 @@ func (this *CompanyController) DetailByCreditCode() {
 								items[itemK].ExpireDay = expireDay
 							}
 						}
+						plist.Items = items
 					}
 					plist.ClassifyName = v.PermissionName
 					plist.CheckList = checkList

controllers/company_apply.go

@@ -1958,7 +1958,6 @@ func (this *CompanyApplyController) ApplyContract() {
 				plist.Items = make([]*company.PermissionLookItem, 0)
 				items, ok := permissionMap[v.ChartPermissionId]
 				if ok {
-					plist.Items = items
 					for _, n := range items {
 						count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, contractItem.CompanyContractId, n.ChartPermissionId)
 						if err != nil {
@@ -1970,6 +1969,7 @@ func (this *CompanyApplyController) ApplyContract() {
 							checkList = append(checkList, n.ChartPermissionId)
 						}
 					}
+					plist.Items = items
 				}
 				plist.ClassifyName = v.PermissionName
 				plist.CheckList = checkList

services/contract/contract.go

@@ -1186,7 +1186,6 @@ func GetPermissionByPermissionIdMap(productId int, checkPermissionIdMap map[int]
 			plist.Items = make([]*company.PermissionLookItem, 0)
 			items, ok1 := permissionMap[v.ChartPermissionId]
 			if ok1 {
-				plist.Items = items
 				for _, n := range items {
 					if _, ok := checkPermissionIdMap[n.ChartPermissionId]; ok {
 						checkList = append(checkList, n.ChartPermissionId)
@@ -1195,6 +1194,7 @@ func GetPermissionByPermissionIdMap(productId int, checkPermissionIdMap map[int]
 						n.IsUpgrade = 1
 					}
 				}
+				plist.Items = items
 			}
 			plist.ClassifyName = v.PermissionName
 			plist.CheckList = checkList