Merge branch 'feature/v1.2.18_ws' of BaseService/userCenter into feature/v1.2.18

entity/workDesktop.go

@@ -77,7 +77,7 @@ func (m *WorkDesktopMenu) GetMenuTreeData() error {
 	case 1:
 		positionType = `AND available >= 2`
 		//P364 企业角色
-		positionType += fmt.Sprintf(` AND FIND_IN_SET('%d',entrole) `, m.EntNicheDis)
+		positionType += fmt.Sprintf(` AND (FIND_IN_SET('0',entrole) OR FIND_IN_SET('%d',entrole))`, m.EntNicheDis)
 	}
 	//tidb数据
 	query := fmt.Sprintf(`SELECT * FROM `+ConfigJson.WorkTableOut+` WHERE  appid=? AND status=%d %s  ORDER BY id ASC`, m.WorkStatus, positionType)