Merge remote-tracking branch 'origin/master'

controllers/cygx/enter_score.go

@@ -540,8 +540,8 @@ func (this *EnterScoreController) EnterScoreList() {
 	}
 	var condition string
 	var pars []interface{}
-	//如果不是权益管理员和admin，就做可见权限限制
+	//如果不是权益管理员和admin、财务，就做可见权限限制
-	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_RESEARCHR {
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_RESEARCHR && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_FINANCE {
 		var conditionAdmin string
 		var parsAdmin []interface{}
 		conditionAdmin = "  AND product_id = 2  AND   status = '永续'  AND seller_id =  ?  "

services/company.go

@@ -998,6 +998,9 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 						button.BtnShare = true
 						button.BtnRemarkEdit = true
 						button.BtnRemarkView = true
+						if sellerId != sysUserId {
+							button.BtnModifySeller = false
+						}
 					} else if productStatus == utils.COMPANY_STATUS_TRY_OUT { //试用
 						button.BtnEdit = true
 						button.BtnDelete = true
@@ -1008,11 +1011,17 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 						button.BtnModifySeller = true
 						button.BtnRemarkEdit = true
 						button.BtnRemarkView = true
+						if sellerId != sysUserId {
+							button.BtnModifySeller = false
+						}
 					} else if productStatus == utils.COMPANY_STATUS_FREEZE { //冻结
 						button.BtnThaw = true
 						button.BtnModifySeller = true
 						button.BtnRemarkEdit = true
 						button.BtnRemarkView = true
+						if sellerId != sysUserId {
+							button.BtnModifySeller = false
+						}
 					} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
 						button.BtnApplyReceive = true
 					} else { //永续

services/cygx/admin_power.go

@@ -146,7 +146,7 @@ func GetAdminLookUserCompanyIds(sysUser *system.Admin) (companyIds []int, err er
 func GetAdminLookUserCompanyIdsBySelf(sysUser *system.Admin) (companyIds []int, err error) {
 	//如果不是管理员，权益管理员那么就对可见权限范围做处理
 	adminIds := make([]int, 0)
-	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN {
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_FINANCE {
 		//if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
 		//	//如果是权益的组长就获取下面的组员
 		//	adminList, e := system.GetAdminListByGroupId(sysUser.GroupId)